From 7a398dcaf838b6c08c9d041575df612d9436135c Mon Sep 17 00:00:00 2001 From: guillaume Date: Mon, 3 Jan 2022 16:54:08 +0100 Subject: [PATCH 1/3] Port alpine version to 3.15.0 Signed-off-by: guillaume --- stdlib/alpine/alpine.cue | 2 +- stdlib/alpine/tests/alpine.cue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/alpine/alpine.cue b/stdlib/alpine/alpine.cue index b7b76a30..6760f962 100644 --- a/stdlib/alpine/alpine.cue +++ b/stdlib/alpine/alpine.cue @@ -6,7 +6,7 @@ import ( ) // Default Alpine version -let defaultVersion = "3.13.5@sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f" +let defaultVersion = "3.15.0@sha256:c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060" // Base image for Alpine Linux #Image: { diff --git a/stdlib/alpine/tests/alpine.cue b/stdlib/alpine/tests/alpine.cue index 71329ca9..987e811b 100644 --- a/stdlib/alpine/tests/alpine.cue +++ b/stdlib/alpine/tests/alpine.cue @@ -28,7 +28,7 @@ TestPackageInstall: { image: #Image & { package: jq: true package: curl: true - version: "3.13" + version: "3.15.0" } test: #up: [ From 80a21cd6eaa34397d77ba6eff41ae31cce539b3e Mon Sep 17 00:00:00 2001 From: guillaume Date: Mon, 3 Jan 2022 17:01:52 +0100 Subject: [PATCH 2/3] Move pined packages to latest distro: core tests Signed-off-by: guillaume --- tests/core/secrets/invalid/env/env.cue | 2 +- tests/core/secrets/invalid/string/string.cue | 2 +- tests/core/secrets/simple/simple.cue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/core/secrets/invalid/env/env.cue b/tests/core/secrets/invalid/env/env.cue index bfe94379..08a2dcda 100644 --- a/tests/core/secrets/invalid/env/env.cue +++ b/tests/core/secrets/invalid/env/env.cue @@ -11,7 +11,7 @@ mySecret: dagger.#Secret TestSecrets: #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" + package: bash: true } }, diff --git a/tests/core/secrets/invalid/string/string.cue b/tests/core/secrets/invalid/string/string.cue index aa194dee..1e976641 100644 --- a/tests/core/secrets/invalid/string/string.cue +++ b/tests/core/secrets/invalid/string/string.cue @@ -10,7 +10,7 @@ mySecret: dagger.#Secret TestString: #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" + package: bash: true } }, diff --git a/tests/core/secrets/simple/simple.cue b/tests/core/secrets/simple/simple.cue index 43374444..2abfbf4a 100644 --- a/tests/core/secrets/simple/simple.cue +++ b/tests/core/secrets/simple/simple.cue @@ -11,7 +11,7 @@ mySecret: dagger.#Secret TestSecrets: #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" + package: bash: true } }, From bd4916873bd409004c954d3b2bfa534f751bb70f Mon Sep 17 00:00:00 2001 From: guillaume Date: Tue, 4 Jan 2022 15:27:33 +0100 Subject: [PATCH 3/3] Port packages to latest versions + update netlify to latest CLI version + update aws to latest version Signed-off-by: guillaume --- docs/reference/aws/README.md | 6 +++--- docs/reference/aws/ecr.md | 2 +- stdlib/alpine/alpine.cue | 2 +- stdlib/argocd/argocd.cue | 4 ++-- stdlib/aws/aws.cue | 14 +++++++------- stdlib/aws/s3/tests/verify.cue | 2 +- stdlib/bats/bats.cue | 4 ++-- stdlib/gcp/gcloud.cue | 10 +++++----- stdlib/gcp/gcs/tests/verify.cue | 2 +- stdlib/gcp/secretmanager/secrets.cue | 6 +++--- stdlib/git/git.cue | 12 ++++++------ stdlib/git/tests/git/git.cue | 12 ++++++------ stdlib/graphql/tests/graphql.cue | 2 +- stdlib/http/http.cue | 6 +++--- stdlib/http/tests/http.cue | 4 ++-- stdlib/java/maven/maven.cue | 6 +++--- stdlib/java/maven/tests/maven.cue | 2 +- stdlib/js/yarn/tests/yarn.cue | 4 ++-- stdlib/js/yarn/yarn.cue | 4 ++-- stdlib/kubernetes/kubernetes.cue | 4 ++-- stdlib/kubernetes/kustomize/kustomization.cue | 4 ++-- stdlib/kubernetes/kustomize/tests/verify.cue | 2 +- stdlib/netlify/netlify.cue | 8 ++++---- stdlib/netlify/netlify.sh.cue | 6 +++--- stdlib/netlify/tests/netlify.cue | 2 +- stdlib/os/tests/os/os.cue | 4 ++-- stdlib/random/string.cue | 2 +- stdlib/trivy/trivy.cue | 4 ++-- 28 files changed, 70 insertions(+), 70 deletions(-) diff --git a/docs/reference/aws/README.md b/docs/reference/aws/README.md index 7aa3e013..55d60417 100644 --- a/docs/reference/aws/README.md +++ b/docs/reference/aws/README.md @@ -20,7 +20,7 @@ import "alpha.dagger.io/aws" |*config.accessKey* | `dagger.#Secret` |AWS access key | |*config.secretKey* | `dagger.#Secret` |AWS secret key | |*config.localMode* | `*false \| bool` |AWS localstack mode | -|*version* | `*"1.18" \| string` |- | +|*version* | `*"1.19" \| string` |- | ### aws.#CLI Outputs @@ -55,7 +55,7 @@ Configuration specific to CLI v1 |*config.accessKey* | `dagger.#Secret` |AWS access key | |*config.secretKey* | `dagger.#Secret` |AWS secret key | |*config.localMode* | `*false \| bool` |AWS localstack mode | -|*version* | `*"1.18" \| string` |- | +|*version* | `*"1.19" \| string` |- | ### aws.#V1 Outputs @@ -73,7 +73,7 @@ Configuration specific to CLI v2 |*config.accessKey* | `dagger.#Secret` |AWS access key | |*config.secretKey* | `dagger.#Secret` |AWS secret key | |*config.localMode* | `*false \| bool` |AWS localstack mode | -|*version* | `*"2.1.27" \| string` |- | +|*version* | `*"2.1.29" \| string` |- | ### aws.#V2 Outputs diff --git a/docs/reference/aws/ecr.md b/docs/reference/aws/ecr.md index f6da7236..79e54e06 100644 --- a/docs/reference/aws/ecr.md +++ b/docs/reference/aws/ecr.md @@ -26,7 +26,7 @@ Convert ECR credentials to Docker Login format |*ctr.image.config.accessKey* | `dagger.#Secret` |AWS access key | |*ctr.image.config.secretKey* | `dagger.#Secret` |AWS secret key | |*ctr.image.config.localMode* | `*false \| bool` |AWS localstack mode | -|*ctr.image.version* | `*"1.18" \| string` |- | +|*ctr.image.version* | `*"1.19" \| string` |- | ### ecr.#Credentials Outputs diff --git a/stdlib/alpine/alpine.cue b/stdlib/alpine/alpine.cue index 6760f962..329b06c0 100644 --- a/stdlib/alpine/alpine.cue +++ b/stdlib/alpine/alpine.cue @@ -6,7 +6,7 @@ import ( ) // Default Alpine version -let defaultVersion = "3.15.0@sha256:c74f1b1166784193ea6c8f9440263b9be6cae07dfe35e32a5df7a31358ac2060" +let defaultVersion = "3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3" // Base image for Alpine Linux #Image: { diff --git a/stdlib/argocd/argocd.cue b/stdlib/argocd/argocd.cue index 348cdb57..f304f917 100644 --- a/stdlib/argocd/argocd.cue +++ b/stdlib/argocd/argocd.cue @@ -38,8 +38,8 @@ import ( #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" - package: jq: "=~1.6" + package: bash: true + package: jq: true package: curl: true } }, diff --git a/stdlib/aws/aws.cue b/stdlib/aws/aws.cue index af0389a8..3f4730ec 100644 --- a/stdlib/aws/aws.cue +++ b/stdlib/aws/aws.cue @@ -24,14 +24,14 @@ import ( #V1: { config: #Config package: [string]: string | bool - version: dagger.#Input & {*"1.18" | string} + version: dagger.#Input & {*"1.19" | string} #up: [ op.#Load & { from: alpine.#Image & { "package": package - "package": bash: "=~5.1" - "package": jq: "=~1.6" + "package": bash: true + "package": jq: true "package": curl: true "package": "aws-cli": "=~\( version )" if config.localMode != false { @@ -47,14 +47,14 @@ import ( #V2: { config: #Config package: [string]: string | bool - version: dagger.#Input & {*"2.1.27" | string} + version: dagger.#Input & {*"2.1.29" | string} #up: [ op.#Load & { from: alpine.#Image & { "package": package - "package": bash: "=~5.1" - "package": jq: "=~1.6" + "package": bash: true + "package": jq: true "package": curl: true "package": binutils: true if config.localMode != false { @@ -87,7 +87,7 @@ import ( #CLI: { config: #Config package: [string]: string | bool - version: dagger.#Input & {*"1.18" | string} + version: dagger.#Input & {*"1.19" | string} _isV2: regexp.Match("^2.*$", version) diff --git a/stdlib/aws/s3/tests/verify.cue b/stdlib/aws/s3/tests/verify.cue index 1356a8b0..f27897ec 100644 --- a/stdlib/aws/s3/tests/verify.cue +++ b/stdlib/aws/s3/tests/verify.cue @@ -64,7 +64,7 @@ import ( test: #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "~5.1" + package: bash: true } }, diff --git a/stdlib/bats/bats.cue b/stdlib/bats/bats.cue index bf81c140..35e6dcfb 100644 --- a/stdlib/bats/bats.cue +++ b/stdlib/bats/bats.cue @@ -35,8 +35,8 @@ import ( ctr: os.#Container & { image: alpine.#Image & { package: curl: true - package: bash: "~=5.1" - package: jq: "~=1.6" + package: bash: true + package: jq: true package: npm: true package: git: true } diff --git a/stdlib/gcp/gcloud.cue b/stdlib/gcp/gcloud.cue index 9a03be7c..1a3f2a20 100644 --- a/stdlib/gcp/gcloud.cue +++ b/stdlib/gcp/gcloud.cue @@ -8,21 +8,21 @@ import ( // Re-usable gcloud component #GCloud: { config: #Config - version: string | *"288.0.0" + version: string | *"366.0.0" package: [string]: string | bool #up: [ op.#Load & { from: alpine.#Image & { "package": package - "package": bash: "=~5.1" - "package": python3: "=~3.8" - "package": jq: "=~1.6" + "package": bash: true + "package": python3: true + "package": jq: true "package": curl: true } }, - // Install the gcloud cli + // Install the gcloud cli op.#Exec & { args: ["sh", "-c", #""" diff --git a/stdlib/gcp/gcs/tests/verify.cue b/stdlib/gcp/gcs/tests/verify.cue index 4ad06e84..a0f72695 100644 --- a/stdlib/gcp/gcs/tests/verify.cue +++ b/stdlib/gcp/gcs/tests/verify.cue @@ -64,7 +64,7 @@ import ( test: #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "~5.1" + package: bash: true } }, diff --git a/stdlib/gcp/secretmanager/secrets.cue b/stdlib/gcp/secretmanager/secrets.cue index 5c5b83e3..18a673c4 100644 --- a/stdlib/gcp/secretmanager/secrets.cue +++ b/stdlib/gcp/secretmanager/secrets.cue @@ -37,20 +37,20 @@ import ( # If secret not found if [[ ! "${status}" -eq 0 ]]; then (\ - RES=$(gcloud secrets create "${FILE##*/}" --replication-policy automatic --data-file "${FILE}" --format='value(name)' | sed -n '1!p') \ + RES="$(gcloud secrets create "${FILE##*/}" --replication-policy automatic --data-file "${FILE}" --format='value(name)' 2>&1 | sed -n '1!p')" \ && cat <<< $(cat /tmp/output.json | jq ".|.\"${FILE##*/}\"=\"$RES\"") > /tmp/output.json \ ) || (echo "Error while creating secret ${FILE##*/}" >&2 && exit 1) BOOL=1 else (\ - RES=$(gcloud secrets versions add "${FILE##*/}" --data-file "${FILE}" --format='value(name)' | sed -n '1!p') \ + RES="$(gcloud secrets versions add "${FILE##*/}" --data-file "${FILE}" --format='value(name)' 2>&1 | sed -n '1!p')" \ && cat <<< $(cat /tmp/output.json | jq ".|.\"${FILE##*/}\"=\"$RES\"") > /tmp/output.json \ ) || (echo "Error while updating secret ${FILE##*/}" >&2 && exit 1) BOOL=1 fi if [ $BOOL -eq 0 ]; then (\ - RES=$(gcloud secrets describe "${FILE##*/}" --format='value(name)') \ + RES="$(gcloud secrets describe "${FILE##*/}" --format='value(name)' 2>&1)" \ && cat <<< $(cat /tmp/output.json | jq ".|.\"${FILE##*/}\"=\"$RES\"") > /tmp/output.json \ ) || (echo "Error while retrieving secret ${FILE##*/}" >&2 && exit 1) fi diff --git a/stdlib/git/git.cue b/stdlib/git/git.cue index c87a0933..9aa70e34 100644 --- a/stdlib/git/git.cue +++ b/stdlib/git/git.cue @@ -31,7 +31,7 @@ import ( #up: [ op.#Load & { from: alpine.#Image & { - package: git: "=~2.30" + package: git: true } }, op.#Copy & { @@ -91,8 +91,8 @@ import ( #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" - package: git: "=~2.30" + package: bash: true + package: git: true } }, @@ -132,9 +132,9 @@ import ( #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" - package: jq: "=~1.6" - package: git: "=~2.30" + package: bash: true + package: jq: true + package: git: true } }, diff --git a/stdlib/git/tests/git/git.cue b/stdlib/git/tests/git/git.cue index 46916318..a619e15d 100644 --- a/stdlib/git/tests/git/git.cue +++ b/stdlib/git/tests/git/git.cue @@ -31,7 +31,7 @@ tagsList: #Tags & { TestRepository: os.#Container & { image: alpine.#Image & { - package: bash: "=5.1.0-r0" + package: bash: true package: git: true } mount: "/repo1": from: repo @@ -43,7 +43,7 @@ TestRepository: os.#Container & { TestSubRepository: os.#Container & { image: alpine.#Image & { - package: bash: "=5.1.0-r0" + package: bash: true package: git: true } mount: "/repo1": from: repoSubDir @@ -55,7 +55,7 @@ TestSubRepository: os.#Container & { TestCurrentBranch: os.#Container & { image: alpine.#Image & { - package: bash: "=5.1.0-r0" + package: bash: true package: git: true } env: BRANCH_NAME: branch.name @@ -66,7 +66,7 @@ TestCurrentBranch: os.#Container & { TestCurrentTags: os.#Container & { image: alpine.#Image & { - package: bash: "=5.1.0-r0" + package: bash: true package: git: true } env: TAGS: strings.Join([ for k, v in tagsList.tags {"\(k)=\(v)"}], "\n") @@ -87,7 +87,7 @@ privateRepo: #Repository & { TestPrivateRepository: os.#Container & { image: alpine.#Image & { - package: bash: "=5.1.0-r0" + package: bash: true package: git: true } mount: "/repo1": from: privateRepo @@ -99,7 +99,7 @@ TestPrivateRepository: os.#Container & { TestReferenceFormat: os.#Container & { image: alpine.#Image & { - package: bash: "=5.1.0-r0" + package: bash: true package: git: true } mount: "/repo1": from: privateRepo diff --git a/stdlib/graphql/tests/graphql.cue b/stdlib/graphql/tests/graphql.cue index f4ffb916..ead94ca8 100644 --- a/stdlib/graphql/tests/graphql.cue +++ b/stdlib/graphql/tests/graphql.cue @@ -39,7 +39,7 @@ TestQuery: { testRaw: os.#Container & { image: alpine.#Image & { - package: jq: "~=1.6" + package: jq: true } env: STATUS: "\(queryWithoutToken.post.response.statusCode)" shell: args: ["--noprofile", "--norc", "-eo", "pipefail", "-c"] diff --git a/stdlib/http/http.cue b/stdlib/http/http.cue index a1d4fb6e..fd73668a 100644 --- a/stdlib/http/http.cue +++ b/stdlib/http/http.cue @@ -27,8 +27,8 @@ import ( ctr: os.#Container & { image: alpine.#Image & { package: curl: true - package: bash: "=5.1.0-r0" - package: jq: "~=1.6" + package: bash: true + package: jq: true } shell: path: "/bin/bash" always: true @@ -109,7 +109,7 @@ import ( #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" + package: bash: true package: curl: true } }, diff --git a/stdlib/http/tests/http.cue b/stdlib/http/tests/http.cue index a512b633..69e2bd7e 100644 --- a/stdlib/http/tests/http.cue +++ b/stdlib/http/tests/http.cue @@ -28,7 +28,7 @@ Testhealth: #Wait & { TestWait: query: os.#Container & { image: alpine.#Image & { - package: bash: "=~5.1" + package: bash: true package: curl: true } command: #""" @@ -44,7 +44,7 @@ TestRequest: { testRaw: os.#Container & { image: alpine.#Image & { - package: jq: "~=1.6" + package: jq: true package: bash: true } env: STATUS: "\(req.response.statusCode)" diff --git a/stdlib/java/maven/maven.cue b/stdlib/java/maven/maven.cue index 0cdf3cab..59323d26 100644 --- a/stdlib/java/maven/maven.cue +++ b/stdlib/java/maven/maven.cue @@ -40,9 +40,9 @@ import ( ctr: os.#Container & { image: alpine.#Image & { "package": package & { - bash: "=~5.1" - openjdk11: "=~11.0.9" - maven: "=~3.6.3" + bash: true + openjdk11: true + maven: true } } shell: path: "/bin/bash" diff --git a/stdlib/java/maven/tests/maven.cue b/stdlib/java/maven/tests/maven.cue index 39bbb411..ffc09b17 100644 --- a/stdlib/java/maven/tests/maven.cue +++ b/stdlib/java/maven/tests/maven.cue @@ -32,7 +32,7 @@ TestSpringBoot: { test: os.#Container & { image: alpine.#Image & { - package: bash: "=5.1.0-r0" + package: bash: true } copy: "/build": from: project.build command: """ diff --git a/stdlib/js/yarn/tests/yarn.cue b/stdlib/js/yarn/tests/yarn.cue index 8cf8a9ef..9c7dc98f 100644 --- a/stdlib/js/yarn/tests/yarn.cue +++ b/stdlib/js/yarn/tests/yarn.cue @@ -15,7 +15,7 @@ TestReact: { test: os.#Container & { image: alpine.#Image & { - package: bash: "=5.1.0-r0" + package: bash: true } mount: "/build": from: pkg.build command: """ @@ -42,7 +42,7 @@ TestSecretsAndFile: { test: os.#Container & { image: alpine.#Image & { - package: bash: "=5.1.0-r0" + package: bash: true } shell: path: "/bin/bash" mount: "/build": from: pkg.build diff --git a/stdlib/js/yarn/yarn.cue b/stdlib/js/yarn/yarn.cue index ec75dd15..84b72fb1 100644 --- a/stdlib/js/yarn/yarn.cue +++ b/stdlib/js/yarn/yarn.cue @@ -53,8 +53,8 @@ import ( ctr: os.#Container & { image: alpine.#Image & { "package": package & { - bash: "=~5.1" - yarn: "=~1.22" + bash: true + yarn: true } } shell: path: "/bin/bash" diff --git a/stdlib/kubernetes/kubernetes.cue b/stdlib/kubernetes/kubernetes.cue index a5874558..e4d794c5 100644 --- a/stdlib/kubernetes/kubernetes.cue +++ b/stdlib/kubernetes/kubernetes.cue @@ -23,8 +23,8 @@ import ( #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" - package: jq: "=~1.6" + package: bash: true + package: jq: true package: curl: true } }, diff --git a/stdlib/kubernetes/kustomize/kustomization.cue b/stdlib/kubernetes/kustomize/kustomization.cue index 60cf3dd7..ab90ad5e 100644 --- a/stdlib/kubernetes/kustomize/kustomization.cue +++ b/stdlib/kubernetes/kustomize/kustomization.cue @@ -20,8 +20,8 @@ import ( #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" - package: jq: "=~1.6" + package: bash: true + package: jq: true package: curl: true } }, diff --git a/stdlib/kubernetes/kustomize/tests/verify.cue b/stdlib/kubernetes/kustomize/tests/verify.cue index 3ef6f8db..9349a277 100644 --- a/stdlib/kubernetes/kustomize/tests/verify.cue +++ b/stdlib/kubernetes/kustomize/tests/verify.cue @@ -12,7 +12,7 @@ import ( #up: [ op.#Load & { from: alpine.#Image & { - package: bash: "=~5.1" + package: bash: true } }, diff --git a/stdlib/netlify/netlify.cue b/stdlib/netlify/netlify.cue index d7a0b202..9fd48e71 100644 --- a/stdlib/netlify/netlify.cue +++ b/stdlib/netlify/netlify.cue @@ -61,14 +61,14 @@ import ( ctr: os.#Container & { image: alpine.#Image & { package: { - bash: "=~5.1" - jq: "=~1.6" + bash: true + jq: true curl: true - yarn: "=~1.22" + yarn: true } } setup: [ - "yarn global add netlify-cli@3.38.10", + "yarn global add netlify-cli@8.6.1", ] // set in netlify.sh.cue // FIXME: use embedding once cue supports it diff --git a/stdlib/netlify/netlify.sh.cue b/stdlib/netlify/netlify.sh.cue index 428a60fd..702966e7 100644 --- a/stdlib/netlify/netlify.sh.cue +++ b/stdlib/netlify/netlify.sh.cue @@ -44,9 +44,9 @@ package netlify --prod \ | tee /tmp/stdout - url=$(