From 88594815874602c9171d54a5b31022f07942e420 Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Fri, 26 Apr 2024 15:00:59 -0700 Subject: [PATCH 1/3] docker-build --- awsx/ecr/image.ts | 57 ++++++++++++++++++++++++++++++----------------- awsx/package.json | 2 +- awsx/yarn.lock | 18 ++++++++++----- 3 files changed, 50 insertions(+), 27 deletions(-) diff --git a/awsx/ecr/image.ts b/awsx/ecr/image.ts index 382f6e9c3..b9eaf4de5 100644 --- a/awsx/ecr/image.ts +++ b/awsx/ecr/image.ts @@ -13,7 +13,7 @@ // limitations under the License. import * as aws from "@pulumi/aws"; -import * as docker from "@pulumi/docker"; +import * as docker from "@pulumi/docker-build"; import * as pulumi from "@pulumi/pulumi"; import * as schema from "../schema-types"; import * as utils from "../utils"; @@ -62,37 +62,52 @@ export function computeImageFromAsset( throw new Error("Invalid credentials"); } return { - registry: ecrCredentials.proxyEndpoint, + address: ecrCredentials.proxyEndpoint, username: username, password: password, }; }); + let cacheFrom: docker.types.input.CacheFromArgs[] = []; + if (dockerInputs.cacheFrom !== undefined) { + cacheFrom = dockerInputs.cacheFrom.map((c) => { + return { + registry: { + ref: c, + }, + }; + }); + } + // Use an inline cache by default. + if (cacheFrom.length === 0) { + cacheFrom.push({ registry: { ref: canonicalImageName } }); + } + + let context = "."; + if (dockerInputs.context !== undefined) { + context = dockerInputs.context; + } + const dockerImageArgs: docker.ImageArgs = { - imageName: canonicalImageName, - build: { - args: dockerInputs.args, - builderVersion: dockerInputs.builderVersion, - cacheFrom: dockerInputs.cacheFrom - ? { - images: dockerInputs.cacheFrom, - } - : undefined, - context: dockerInputs.context, - dockerfile: dockerInputs.dockerfile, - platform: dockerInputs.platform, - target: dockerInputs.target, - }, - registry: registryCredentials, + tags: [canonicalImageName], + buildArgs: dockerInputs.args, + cacheFrom: cacheFrom, + cacheTo: [{ inline: {} }], + context: { location: context }, + dockerfile: { location: dockerInputs.dockerfile }, + platforms: dockerInputs.platform ? [dockerInputs.platform as docker.Platform] : [], + target: dockerInputs.target, + push: true, + registries: [registryCredentials], }; const image = new docker.Image(imageName, dockerImageArgs, { parent }); - image.repoDigest.apply((d: any) => - pulumi.log.debug(` build complete: ${imageName} (${d})`, parent), - ); + image.ref.apply((ref) => { + pulumi.log.debug(` build complete: ${ref}`, parent); + }); - return image.repoDigest; + return image.ref; } function createUniqueImageName(inputs: pulumi.Unwrap): string { diff --git a/awsx/package.json b/awsx/package.json index e889e1017..9d77d0486 100644 --- a/awsx/package.json +++ b/awsx/package.json @@ -25,7 +25,7 @@ "//": "Pulumi sub-provider dependencies must be pinned at an exact version because we extract this value to generate the correct dependency in the schema", "dependencies": { "@pulumi/aws": "6.47.0", - "@pulumi/docker": "4.5.1", + "@pulumi/docker-build": "^0.0.4", "@pulumi/pulumi": "3.127.0", "@types/aws-lambda": "^8.10.23", "docker-classic": "npm:@pulumi/docker@3.6.1", diff --git a/awsx/yarn.lock b/awsx/yarn.lock index d1a9dcbf1..e25dc8c1b 100644 --- a/awsx/yarn.lock +++ b/awsx/yarn.lock @@ -1666,13 +1666,12 @@ mime "^2.0.0" resolve "^1.7.1" -"@pulumi/docker@4.5.1": - version "4.5.1" - resolved "https://registry.yarnpkg.com/@pulumi/docker/-/docker-4.5.1.tgz#9058851bebbb358a1081c765d928fd6791c6c7ba" - integrity sha512-2BTFycFLwSpHGQ4IFTsUHl8H5w81AgkrMHSLUQ8Zu6HBDgGhB5up6YsxVqLeaUeWAedEUrrSCY3xTCNbP4a0ag== +"@pulumi/docker-build@^0.0.4": + version "0.0.4" + resolved "https://registry.yarnpkg.com/@pulumi/docker-build/-/docker-build-0.0.4.tgz#6a4f7b5e982a4a58bcf7c2ddef450ae2b0cba972" + integrity sha512-RiXfB2Ut8CicnLKKb9YMA9j3Ceb/FPxl4X2bJCkMOiVYKODxVC5BVkfNWUmENzTYQRr32Yd3Nypzi2hi50pzEA== dependencies: "@pulumi/pulumi" "^3.0.0" - semver "^5.4.0" "@pulumi/pulumi@3.127.0", "@pulumi/pulumi@^3.0.0": version "3.127.0" @@ -4906,6 +4905,15 @@ read-package-json-fast@^3.0.0, read-package-json-fast@^3.0.2: json-parse-even-better-errors "^3.0.0" npm-normalize-package-bin "^3.0.0" +read-package-tree@^5.2.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636" + integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw== + dependencies: + read-package-json "^2.0.0" + readdir-scoped-modules "^1.0.0" + util-promisify "^2.1.0" + readable-stream@^2.0.0, readable-stream@^2.1.4: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" From 184869538b042cd39476f559cf8dedd2ff949086 Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Wed, 7 Aug 2024 12:43:10 -0700 Subject: [PATCH 2/3] fix dependencies --- awsx/package.json | 2 +- awsx/scripts/generate-provider-types.ts | 1 - awsx/yarn.lock | 17 ++++--------- schemagen/pkg/gen/schema.go | 32 ++++++++++++------------- 4 files changed, 21 insertions(+), 31 deletions(-) diff --git a/awsx/package.json b/awsx/package.json index 9d77d0486..012f1dbf5 100644 --- a/awsx/package.json +++ b/awsx/package.json @@ -25,7 +25,7 @@ "//": "Pulumi sub-provider dependencies must be pinned at an exact version because we extract this value to generate the correct dependency in the schema", "dependencies": { "@pulumi/aws": "6.47.0", - "@pulumi/docker-build": "^0.0.4", + "@pulumi/docker-build": "0.0.5", "@pulumi/pulumi": "3.127.0", "@types/aws-lambda": "^8.10.23", "docker-classic": "npm:@pulumi/docker@3.6.1", diff --git a/awsx/scripts/generate-provider-types.ts b/awsx/scripts/generate-provider-types.ts index d0a4ed6cd..8e1a66b4a 100644 --- a/awsx/scripts/generate-provider-types.ts +++ b/awsx/scripts/generate-provider-types.ts @@ -32,7 +32,6 @@ const externalRefs = (() => { }; }; addRef("aws"); - addRef("docker"); return externalRefs; })(); diff --git a/awsx/yarn.lock b/awsx/yarn.lock index e25dc8c1b..df9d9ddff 100644 --- a/awsx/yarn.lock +++ b/awsx/yarn.lock @@ -1666,10 +1666,10 @@ mime "^2.0.0" resolve "^1.7.1" -"@pulumi/docker-build@^0.0.4": - version "0.0.4" - resolved "https://registry.yarnpkg.com/@pulumi/docker-build/-/docker-build-0.0.4.tgz#6a4f7b5e982a4a58bcf7c2ddef450ae2b0cba972" - integrity sha512-RiXfB2Ut8CicnLKKb9YMA9j3Ceb/FPxl4X2bJCkMOiVYKODxVC5BVkfNWUmENzTYQRr32Yd3Nypzi2hi50pzEA== +"@pulumi/docker-build@0.0.5": + version "0.0.5" + resolved "https://registry.yarnpkg.com/@pulumi/docker-build/-/docker-build-0.0.5.tgz#9e86ac0761b7fba4f24064095658bf4cf3a03a42" + integrity sha512-oaPSvgwQ0FclGKz8WGdlPvSV4Iw1rg7HkL6dqrTRxNpXBnlPRodDuYRyk/hWCrvQx+dZchJna4j3urFXOWPCEw== dependencies: "@pulumi/pulumi" "^3.0.0" @@ -4905,15 +4905,6 @@ read-package-json-fast@^3.0.0, read-package-json-fast@^3.0.2: json-parse-even-better-errors "^3.0.0" npm-normalize-package-bin "^3.0.0" -read-package-tree@^5.2.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz#a32cb64c7f31eb8a6f31ef06f9cedf74068fe636" - integrity sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw== - dependencies: - read-package-json "^2.0.0" - readdir-scoped-modules "^1.0.0" - util-promisify "^2.1.0" - readable-stream@^2.0.0, readable-stream@^2.1.4: version "2.3.8" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b" diff --git a/schemagen/pkg/gen/schema.go b/schemagen/pkg/gen/schema.go index 254f95629..472b84389 100644 --- a/schemagen/pkg/gen/schema.go +++ b/schemagen/pkg/gen/schema.go @@ -37,7 +37,7 @@ func GenerateSchema(packageDir string) schema.PackageSpec { dependencies := readPackageDependencies(packageDir) awsSpec := getPackageSpec("aws", dependencies.Aws) awsNativeSpec := getPackageSpec("aws-native", awsNativeTypesVersion) - dockerSpec := getPackageSpec("docker", dependencies.Docker) + dockerSpec := getPackageSpec("docker-build", dependencies.Docker) packageSpec := schema.PackageSpec{ Name: "awsx", @@ -67,25 +67,25 @@ func GenerateSchema(packageDir string) schema.PackageSpec { "generateResourceContainerTypes": true, "importBasePath": "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx", "liftSingleValueMethodReturns": true, - "internalDependencies": []string{"github.com/pulumi/pulumi-docker/sdk/v4/go/docker"}, + "internalDependencies": []string{"github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild"}, "respectSchemaVersion": true, }), "java": rawMessage(map[string]interface{}{ "dependencies": map[string]string{ - "com.pulumi:aws": dependencies.Aws, - "com.pulumi:docker": dependencies.Docker, + "com.pulumi:aws": dependencies.Aws, + "com.pulumi:docker-build": dependencies.Docker, }, }), "nodejs": rawMessage(map[string]interface{}{ "dependencies": map[string]string{ - "@aws-sdk/client-ecs": "^3.405.0", - "@pulumi/pulumi": "^3.0.0", - "@pulumi/aws": "^" + dependencies.Aws, - "@pulumi/docker": "^" + dependencies.Docker, - "docker-classic": "npm:@pulumi/docker@3.6.1", - "@types/aws-lambda": "^8.10.23", - "aws-sdk": "^2.1450.0", - "mime": "^2.0.0", + "@aws-sdk/client-ecs": "^3.405.0", + "@pulumi/pulumi": "^3.0.0", + "@pulumi/aws": "^" + dependencies.Aws, + "@pulumi/docker-build": "^" + dependencies.Docker, + "docker-classic": "npm:@pulumi/docker@3.6.1", + "@types/aws-lambda": "^8.10.23", + "aws-sdk": "^2.1450.0", + "mime": "^2.0.0", }, "devDependencies": map[string]string{ "@types/node": "^18", @@ -96,9 +96,9 @@ func GenerateSchema(packageDir string) schema.PackageSpec { }), "python": rawMessage(map[string]interface{}{ "requires": map[string]string{ - "pulumi": ">=3.91.1,<4.0.0", - "pulumi-aws": ">=6.0.4,<7.0.0", - "pulumi-docker": fmt.Sprintf(">=%s,<5.0.0", dependencies.Docker), + "pulumi": ">=3.91.1,<4.0.0", + "pulumi-aws": ">=6.0.4,<7.0.0", + "pulumi-docker-build": fmt.Sprintf(">=%s,<1.0.0", dependencies.Docker), }, "usesIOClasses": true, "readme": "Pulumi Amazon Web Services (AWS) AWSX Components.", @@ -256,7 +256,7 @@ func rawMessage(v interface{}) schema.RawMessage { type Dependencies struct { Aws string `json:"@pulumi/aws"` - Docker string `json:"@pulumi/docker"` + Docker string `json:"@pulumi/docker-build"` Pulumi string `json:"@pulumi/pulumi"` } From c1c577860f9bf39d9138e7f55c27fe81f9537314 Mon Sep 17 00:00:00 2001 From: Bryce Lampe Date: Wed, 7 Aug 2024 12:43:27 -0700 Subject: [PATCH 3/3] regenerate schema + sdk --- awsx/schema-types.ts | 1 - schema.json | 8 +++---- sdk/go.mod | 15 ++++++------ sdk/go.sum | 43 ++++++++++++++++------------------ sdk/go/awsx/cloudtrail/init.go | 2 +- sdk/go/awsx/ec2/init.go | 2 +- sdk/go/awsx/ecr/init.go | 2 +- sdk/go/awsx/ecs/init.go | 2 +- sdk/go/awsx/init.go | 2 +- sdk/go/awsx/lb/init.go | 2 +- sdk/java/build.gradle | 2 +- sdk/nodejs/package.json | 2 +- sdk/python/pyproject.toml | 2 +- 13 files changed, 40 insertions(+), 45 deletions(-) diff --git a/awsx/schema-types.ts b/awsx/schema-types.ts index eea296e32..3400f82b9 100644 --- a/awsx/schema-types.ts +++ b/awsx/schema-types.ts @@ -23,7 +23,6 @@ export type Functions = { "awsx:ec2:getDefaultVpc": (inputs: getDefaultVpcInputs) => Promise; }; import * as aws from "@pulumi/aws"; -import * as docker from "@pulumi/docker"; export abstract class Trail extends (pulumi.ComponentResource) { public bucket?: aws.s3.Bucket | pulumi.Output; public logGroup?: aws.cloudwatch.LogGroup | pulumi.Output; diff --git a/schema.json b/schema.json index 1eed268f9..ed4634798 100644 --- a/schema.json +++ b/schema.json @@ -27,7 +27,7 @@ "generateResourceContainerTypes": true, "importBasePath": "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx", "internalDependencies": [ - "github.com/pulumi/pulumi-docker/sdk/v4/go/docker" + "github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild" ], "liftSingleValueMethodReturns": true, "respectSchemaVersion": true @@ -35,14 +35,14 @@ "java": { "dependencies": { "com.pulumi:aws": "6.47.0", - "com.pulumi:docker": "4.5.1" + "com.pulumi:docker-build": "0.0.5" } }, "nodejs": { "dependencies": { "@aws-sdk/client-ecs": "^3.405.0", "@pulumi/aws": "^6.47.0", - "@pulumi/docker": "^4.5.1", + "@pulumi/docker-build": "^0.0.5", "@pulumi/pulumi": "^3.0.0", "@types/aws-lambda": "^8.10.23", "aws-sdk": "^2.1450.0", @@ -65,7 +65,7 @@ "requires": { "pulumi": "\u003e=3.91.1,\u003c4.0.0", "pulumi-aws": "\u003e=6.0.4,\u003c7.0.0", - "pulumi-docker": "\u003e=4.5.1,\u003c5.0.0" + "pulumi-docker-build": "\u003e=0.0.5,\u003c1.0.0" }, "respectSchemaVersion": true, "usesIOClasses": true diff --git a/sdk/go.mod b/sdk/go.mod index 4dc7879a0..2a9ad4e1c 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -7,7 +7,7 @@ toolchain go1.22.4 require ( github.com/blang/semver v3.5.1+incompatible github.com/pulumi/pulumi-aws/sdk/v6 v6.47.0 - github.com/pulumi/pulumi-docker/sdk/v4 v4.4.3 + github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild v0.0.3 github.com/pulumi/pulumi/sdk/v3 v3.127.0 ) @@ -18,7 +18,7 @@ require ( github.com/ProtonMail/go-crypto v1.0.0 // indirect github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect github.com/agext/levenshtein v1.2.3 // indirect - github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect + github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect github.com/atotto/clipboard v0.1.4 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/charmbracelet/bubbles v0.16.1 // indirect @@ -26,7 +26,7 @@ require ( github.com/charmbracelet/lipgloss v0.7.1 // indirect github.com/cheggaaa/pb v1.0.29 // indirect github.com/cloudflare/circl v1.3.7 // indirect - github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect + github.com/containerd/console v1.0.4 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/djherbis/times v1.5.0 // indirect github.com/emirpasic/gods v1.18.1 // indirect @@ -40,7 +40,7 @@ require ( github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/hcl/v2 v2.17.0 // indirect + github.com/hashicorp/hcl/v2 v2.19.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect @@ -65,19 +65,18 @@ require ( github.com/rivo/uniseg v0.4.4 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect - github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect + github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/skeema/knownhosts v1.2.2 // indirect github.com/spf13/cobra v1.8.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/objx v0.5.0 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - github.com/zclconf/go-cty v1.13.2 // indirect - go.uber.org/atomic v1.9.0 // indirect + github.com/zclconf/go-cty v1.14.1 // indirect + go.uber.org/atomic v1.10.0 // indirect golang.org/x/crypto v0.24.0 // indirect golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect golang.org/x/mod v0.18.0 // indirect diff --git a/sdk/go.sum b/sdk/go.sum index a908e03fd..7ce28491c 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -15,8 +15,8 @@ github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7l github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= -github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw= -github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= +github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= +github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= @@ -37,8 +37,8 @@ github.com/cheggaaa/pb v1.0.29/go.mod h1:W40334L7FMC5JKWldsTWbdGjLo0RxUKK73K+TuP github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= -github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY= -github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= +github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro= +github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= @@ -84,8 +84,8 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hashicorp/hcl/v2 v2.17.0 h1:z1XvSUyXd1HP10U4lrLg5e0JMVz6CPaJvAgxM0KNZVY= -github.com/hashicorp/hcl/v2 v2.17.0/go.mod h1:gJyW2PTShkJqQBKpAmPO3yxMxIuoXkOF2TpqXzrQyx4= +github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI= +github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= @@ -129,8 +129,8 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo= github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8= -github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= -github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= +github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/opentracing/basictracer-go v1.1.0 h1:Oa1fTSBvAl8pa3U+IJYqrKm0NALwH9OsgwOqDv4xJW0= github.com/opentracing/basictracer-go v1.1.0/go.mod h1:V2HZueSJEp879yv285Aap1BS69fQMD+MNP1mRs6mBQc= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -152,8 +152,8 @@ github.com/pulumi/esc v0.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs= github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c= github.com/pulumi/pulumi-aws/sdk/v6 v6.47.0 h1:DEbHd7krLB3p3Qr4PlAaEScA5mQR85jifxln0qd8m6Y= github.com/pulumi/pulumi-aws/sdk/v6 v6.47.0/go.mod h1:gN/y6Gl/c6R2m1H0DlpyeyxpemtLJNhgHWcYz+vBPdo= -github.com/pulumi/pulumi-docker/sdk/v4 v4.4.3 h1:gQC2As+wE8QflbLCG90jLaKwIpqW3yl1y327Jj6ovbI= -github.com/pulumi/pulumi-docker/sdk/v4 v4.4.3/go.mod h1:i19ZhFjFQrngtXYLHp3kjZNRmnEnq/DUdXK6/CBk77o= +github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild v0.0.3 h1:NxCXxRvzhUJP9dIvlpNlZKt/A3NHu3i9pC5XO+i8bR0= +github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild v0.0.3/go.mod h1:jw9NcyRXjv5V2HHHJlqUBdXFCFiLfZoCChWEn38LR2A= github.com/pulumi/pulumi/sdk/v3 v3.127.0 h1:UdCJK9mskCwBf54LGY74/VxSjIWP6ZQhh7isL1zurRo= github.com/pulumi/pulumi/sdk/v3 v3.127.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -165,8 +165,8 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI= github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs= -github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 h1:TToq11gyfNlrMFZiYujSekIsPd9AmsA2Bj/iv+s4JHE= -github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= +github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4= +github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -177,16 +177,13 @@ github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyh github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= @@ -202,10 +199,10 @@ github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.13.2 h1:4GvrUxe/QUDYuJKAav4EYqdM47/kZa672LwmXFmEKT0= -github.com/zclconf/go-cty v1.13.2/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= +github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -317,5 +314,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw= lukechampine.com/frand v1.4.2/go.mod h1:4S/TM2ZgrKejMcKMbeLjISpJMO+/eZ1zu3vYX9dtj3s= -pgregory.net/rapid v0.6.1 h1:4eyrDxyht86tT4Ztm+kvlyNBLIk071gR+ZQdhphc9dQ= -pgregory.net/rapid v0.6.1/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= +pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= +pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= diff --git a/sdk/go/awsx/cloudtrail/init.go b/sdk/go/awsx/cloudtrail/init.go index 58520df00..693f137cd 100644 --- a/sdk/go/awsx/cloudtrail/init.go +++ b/sdk/go/awsx/cloudtrail/init.go @@ -8,7 +8,7 @@ import ( "github.com/blang/semver" "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/internal" - _ "github.com/pulumi/pulumi-docker/sdk/v4/go/docker" + _ "github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/awsx/ec2/init.go b/sdk/go/awsx/ec2/init.go index 679a93041..7236b0605 100644 --- a/sdk/go/awsx/ec2/init.go +++ b/sdk/go/awsx/ec2/init.go @@ -8,7 +8,7 @@ import ( "github.com/blang/semver" "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/internal" - _ "github.com/pulumi/pulumi-docker/sdk/v4/go/docker" + _ "github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/awsx/ecr/init.go b/sdk/go/awsx/ecr/init.go index 5a3707305..ee838f76a 100644 --- a/sdk/go/awsx/ecr/init.go +++ b/sdk/go/awsx/ecr/init.go @@ -8,7 +8,7 @@ import ( "github.com/blang/semver" "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/internal" - _ "github.com/pulumi/pulumi-docker/sdk/v4/go/docker" + _ "github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/awsx/ecs/init.go b/sdk/go/awsx/ecs/init.go index d0cf46fa6..753dd55e0 100644 --- a/sdk/go/awsx/ecs/init.go +++ b/sdk/go/awsx/ecs/init.go @@ -8,7 +8,7 @@ import ( "github.com/blang/semver" "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/internal" - _ "github.com/pulumi/pulumi-docker/sdk/v4/go/docker" + _ "github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/awsx/init.go b/sdk/go/awsx/init.go index faab4832b..321628d3a 100644 --- a/sdk/go/awsx/init.go +++ b/sdk/go/awsx/init.go @@ -8,7 +8,7 @@ import ( "github.com/blang/semver" "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/internal" - _ "github.com/pulumi/pulumi-docker/sdk/v4/go/docker" + _ "github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/go/awsx/lb/init.go b/sdk/go/awsx/lb/init.go index e2d7898ef..a33f45d18 100644 --- a/sdk/go/awsx/lb/init.go +++ b/sdk/go/awsx/lb/init.go @@ -8,7 +8,7 @@ import ( "github.com/blang/semver" "github.com/pulumi/pulumi-awsx/sdk/v2/go/awsx/internal" - _ "github.com/pulumi/pulumi-docker/sdk/v4/go/docker" + _ "github.com/pulumi/pulumi-docker-build/sdk/go/dockerbuild" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle index f6452f90c..e789116dd 100644 --- a/sdk/java/build.gradle +++ b/sdk/java/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation("com.google.code.findbugs:jsr305:3.0.2") implementation("com.google.code.gson:gson:2.8.9") implementation("com.pulumi:aws:6.47.0") - implementation("com.pulumi:docker:4.5.1") + implementation("com.pulumi:docker-build:0.0.5") implementation("com.pulumi:pulumi:0.9.7") } diff --git a/sdk/nodejs/package.json b/sdk/nodejs/package.json index ac09954ce..a6c29193b 100644 --- a/sdk/nodejs/package.json +++ b/sdk/nodejs/package.json @@ -17,7 +17,7 @@ "dependencies": { "@aws-sdk/client-ecs": "^3.405.0", "@pulumi/aws": "^6.47.0", - "@pulumi/docker": "^4.5.1", + "@pulumi/docker-build": "^0.0.5", "@pulumi/pulumi": "^3.0.0", "@types/aws-lambda": "^8.10.23", "aws-sdk": "^2.1450.0", diff --git a/sdk/python/pyproject.toml b/sdk/python/pyproject.toml index 487ae675d..5543fe00d 100644 --- a/sdk/python/pyproject.toml +++ b/sdk/python/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "pulumi_awsx" description = "Pulumi Amazon Web Services (AWS) AWSX Components." - dependencies = ["parver>=0.2.1", "pulumi>=3.91.1,<4.0.0", "pulumi-aws>=6.0.4,<7.0.0", "pulumi-docker>=4.5.1,<5.0.0", "semver>=2.8.1"] + dependencies = ["parver>=0.2.1", "pulumi>=3.91.1,<4.0.0", "pulumi-aws>=6.0.4,<7.0.0", "pulumi-docker-build>=0.0.5,<1.0.0", "semver>=2.8.1"] keywords = ["pulumi", "aws", "awsx", "kind/component", "category/cloud"] readme = "README.md" requires-python = ">=3.8"