Merge pull request #20 from stackbrew/fix-ecr

Fix ecr and gcr auth
stackbrew · May 7, 2020 · e690022 · e690022
2 parents 5c51ce4 + b65e056
commit e690022
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/.script/hack.sh b/.script/hack.sh
@@ -15,7 +15,7 @@ case "${1}" in
     fmt)
         for component in ${COMPONENTS}; do
             (
-                echo "+++ FMT ${component}"
+                echo "+++ FMT ${component}" >&2
                 cd "${PKGDIR}/${component}"
                 # FIXME: fmt is broken with _test.cue files
                 #cue fmt -s
@@ -27,7 +27,7 @@ case "${1}" in
     lint)
         for component in ${COMPONENTS}; do
             (
-                echo "+++ LINTING ${component}"
+                echo "+++ LINTING ${component}" >&2
                 cd "${PKGDIR}/${component}"
                 cue fmt -s
                 cue trim -s
@@ -38,7 +38,7 @@ case "${1}" in
     test)
         for component in ${COMPONENTS}; do
             (
-                echo "+++ TESTING ${component}"
+                echo "+++ TESTING ${component}" >&2
                 cd "${PKGDIR}/${component}"
                 bl-runtime test -f "$TEST_CONFIG" -t "$TEST_TARGET:${component/\//.}"
             )
@@ -47,7 +47,7 @@ case "${1}" in
     publish)
         for component in ${COMPONENTS}; do
             (
-                echo "+++ PUBLISH stackbrew.io/${component}"
+                echo "+++ PUBLISH stackbrew.io/${component}" >&2
                 cd "${PKGDIR}/${component}"
                 bl-runtime publish "stackbrew.io/${component}"
             )
@@ -59,7 +59,7 @@ case "${1}" in
         echo "# Stackbrew Packages" > "$docs"
         for component in ${COMPONENTS}; do
             (
-                echo "+++ DOCUMENTING ${component}"
+                echo "+++ DOCUMENTING ${component}" >&2
                 cd "${PKGDIR}"
                 echo >> "$docs"
                 bl-runtime doc -c "${component}" -o md >> "$docs"

diff --git a/pkg/aws/ecr/ecr.cue b/pkg/aws/ecr/ecr.cue
@@ -17,24 +17,23 @@ Credentials :: {
 
 	// ECR credentials
 	credentials: bl.RegistryCredentials & {
-		username: run.output["/outputs/username"]
+		username: output["/outputs/username"]
 		secret:   bl.Secret & {
 			// FIXME: we should be able to output a bl.Secret directly
-			value: base64.Encode(null, run.output["/outputs/secret"])
+			value: base64.Encode(null, output["/outputs/secret"])
 		}
 	}
 
-	// ECR registry name associated with target
-	registry: run.output["/outputs/registry"]
-
 	// Authentication for ECR Registries
 	auth: bl.RegistryAuth
-	auth: registry: credentials
+	auth: "\(target)": credentials
 
 	helperUrl:
 		"https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/0.4.0/linux-amd64/docker-credential-ecr-login"
 
-	run: bl.BashScript & {
+	output: _
+
+	bl.BashScript & {
 		runPolicy: "always"
 
 		input: {

diff --git a/pkg/aws/ecr/ecr_test.cue b/pkg/aws/ecr/ecr_test.cue
@@ -39,10 +39,16 @@ TestECR: {
 		target: image
 	}
 
+	debug: {
+		source:      build.image
+		target:      image
+		auth:        login.auth
+	}
+
 	// Push the image
 	export: bl.Push & {
 		source:      build.image
-		target:      image
+		target:      login.target
 		auth:        login.auth
 	}
 

diff --git a/pkg/bl.sum b/pkg/bl.sum
@@ -1,3 +1,4 @@
 {
-  "b.l/bl": "sha256:28fa84c1663a754209f89fd97197805cf79e2ef6c48aeecb58227edee3422b37"
+  "b.l/bl": "sha256:28fa84c1663a754209f89fd97197805cf79e2ef6c48aeecb58227edee3422b37",
+  "blocklayer.dev/bl": "sha256:28fa84c1663a754209f89fd97197805cf79e2ef6c48aeecb58227edee3422b37"
 }
diff --git a/pkg/googlecloud/gcr/gcr.cue b/pkg/googlecloud/gcr/gcr.cue
@@ -17,28 +17,22 @@ Credentials :: {
 
 	// Registry Credentials
 	credentials: bl.RegistryCredentials & {
-		username: run.output["/outputs/username"]
+		username: output["/outputs/username"]
 		secret:   bl.Secret & {
 			// FIXME: we should be able to output a bl.Secret directly
-			value: base64.Encode(null, run.output["/outputs/secret"])
+			value: base64.Encode(null, output["/outputs/secret"])
 		}
 	}
 
 	// Authentication for GCR Registries
-	// This list is hardcoded from:
-	// https://github.com/GoogleCloudPlatform/docker-credential-gcr/blob/be7633a109f04f19953c4d830ec5788709c16df4/config/const.go#L50
 	auth: bl.RegistryAuth
-	auth: "gcr.io": credentials
-	auth: "asia.gcr.io": credentials
-	auth: "eu.gcr.io": credentials
-	auth: "marketplace.gcr.io": credentials
-	auth: "staging-k8s.gcr.io": credentials
-	auth: "us.gcr.io": credentials
+	auth: "\(target)": credentials
 
 	helperUrl:
 		"https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.0.1/docker-credential-gcr_linux_amd64-2.0.1.tar.gz"
 
-	run: bl.BashScript & {
+	output: _
+	bl.BashScript & {
 		runPolicy: "always"
 
 		input: {

diff --git a/pkg/googlecloud/gcr/gcr_test.cue b/pkg/googlecloud/gcr/gcr_test.cue
@@ -42,7 +42,7 @@ TestGCR: {
 	// Push the image
 	export: bl.Push & {
 		source:      build.image
-		target:      image
+		target:      login.target
 		auth:        login.auth
 	}