Skip to content

RD-15030: Deprecate S3 credentials #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

RD-15030: Deprecate S3 credentials #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object Dependencies {

val protocolRaw = "com.raw-labs" %% "protocol-raw" % "0.50.0"

val protocolCompiler = "com.raw-labs" %% "protocol-compiler" % "0.51.0"
val protocolCompiler = "com.raw-labs" %% "protocol-compiler" % "0.52.0"

val scalaLogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5"

Expand Down
11 changes: 11 additions & 0 deletions snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/errors/Errors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,17 @@ object MissingSecretWarning {
val message: String = "secret is not defined"
}

final case class S3BucketWarning(
node: BaseNode,
reason: String = S3BucketWarning.message
) extends WarningCompilerMessage {
val code: String = S3BucketWarning.code
}
object S3BucketWarning {
val code: String = "s3Bucket"
val message: String = "S3 bucket credentials are deprecated. Use AWS keys instead."
}

trait InfoCompilerMessage extends CompilerMessage
trait HintCompilerMessage extends CompilerMessage
trait ErrorCompilerMessage extends CompilerMessage
Expand Down
19 changes: 17 additions & 2 deletions snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SemanticAnalyzer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext:
// we check for errors in errorDef, if there are no errors, we are interested in nonErrors(hints, warnings, infos)
override protected def nonErrorDef: SourceNode ==> Seq[CompilerMessage] = {
val snapiNonErrors: PartialFunction[SourceNode, Seq[CompilerMessage]] = {
case e @ FunApp(Proj(exp, "Secret"), parameters)
if tipe(exp) == PackageType("Environment") && !isStagedCompiler =>
case e @ FunApp(Proj(exp, "Secret"), _) if tipe(exp) == PackageType("Environment") && !isStagedCompiler =>
tipe(exp) match {
case PackageType("Environment") =>
// Use getValue to confirm Environment.Secret succeeds. The getValue function also handles potentially unexpected nullables and tryables.
Expand All @@ -554,6 +553,22 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext:
}
case _ => Seq.empty
}
case e @ FunApp(Proj(exp, "Build"), _) if tipe(exp) == PackageType("Environment") && !isStagedCompiler =>
tipe(exp) match {
case PackageType("S3") =>
// Use getValue to confirm it succeeds. The getValue function also handles potentially unexpected nullables and tryables.
// We give it a dummy report which states the expected type is the actual type, so that is skips these checks
val report = CompatibilityReport(tipe(e), tipe(e))
// Try execute "Environment.Secret(<secret_name>)"
val v = getValue(report, e)
v match {
// If getValue returns an error which means the staged compiler failed to execute "Environment.Secret(<secret_name>)" code
// We return a warning that the secret is missing.
case Right(SnapiTryValue(Left(error))) => Seq(S3BucketWarning(e))
case _ => Seq.empty
}
case _ => Seq.empty
}
}
snapiNonErrors.orElse(super.nonErrorDef)
}
Expand Down
10 changes: 7 additions & 3 deletions ...om/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.NodeInfo;
import com.rawlabs.protocol.compiler.AwsConfig;
import com.rawlabs.protocol.compiler.AWSAccessKeysConfig;
import com.rawlabs.protocol.compiler.LocationConfig;
import com.rawlabs.snapi.truffle.SnapiContext;
import com.rawlabs.snapi.truffle.ast.ExpressionNode;
Expand Down Expand Up @@ -64,10 +64,14 @@ public Object executeGeneric(VirtualFrame frame) {
String credName = (String) this.awsCredential.executeGeneric(frame);
// getLocationConfig throws if the credential isn't found.
LocationConfig locationConfig = context.getLocationConfig(credName);
if (!locationConfig.hasAws()) {
if (locationConfig.hasError()) {
String message = locationConfig.getError().getMessage();
throw new TruffleRuntimeException(message);
}
if (!locationConfig.hasAwsAccessKeys()) {
throw new TruffleRuntimeException("credential is not an AWS credential");
}
AwsConfig awsConfig = locationConfig.getAws();
AWSAccessKeysConfig awsConfig = locationConfig.getAwsAccessKeys();
maybeAccessKey = new Some(awsConfig.getAccessKey());
maybeSecretKey = new Some(awsConfig.getSecretKey());
}
Expand Down
Loading