Skip to content
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.

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

Implement Hybrid Functionality and add custom Image resource #413

Merged
merged 67 commits into from
Nov 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
ed5f457
Pull in ExtraTypes changes and update to Go 1.19
guineveresaenger Oct 26, 2022
c1ed2d5
Add Registry and Image as custom resources
guineveresaenger Oct 26, 2022
3c94288
disable typescript overlay
guineveresaenger Oct 28, 2022
cdc99f6
pull in hybrid provider RPC logic
guineveresaenger Oct 31, 2022
b0fabea
put provider logic in provider package
guineveresaenger Oct 31, 2022
e9370a4
add the correct ref tag for Registry
guineveresaenger Nov 1, 2022
1a9b4d8
Update to most recent bridge
guineveresaenger Nov 2, 2022
d3f5f68
Organize code
guineveresaenger Nov 2, 2022
4e28cb9
remove demo username
guineveresaenger Nov 2, 2022
8604973
correctly place token logic to decide which provider to use
guineveresaenger Nov 2, 2022
5f2d8a0
save implementation details for later
guineveresaenger Nov 2, 2022
5b6120c
remove overlay files from SDK
guineveresaenger Nov 2, 2022
79f68f7
remove overlay file reference from resources.go
guineveresaenger Nov 2, 2022
ad88a70
Regenerate SDKs
guineveresaenger Nov 2, 2022
c4bf7a1
Add correct defaults to schema
guineveresaenger Nov 3, 2022
eec3569
rebuild sdks properly
guineveresaenger Nov 3, 2022
bd4b08c
linter fixes
guineveresaenger Nov 9, 2022
1a8f095
resolve old types in Go SDK
guineveresaenger Nov 9, 2022
b9a98b0
Clean git tree
guineveresaenger Nov 9, 2022
6aafb23
skip node tests
guineveresaenger Nov 9, 2022
714524a
temporarily skip tests
guineveresaenger Nov 9, 2022
97afa35
Implement build and push functionality in dockerbuild function
guineveresaenger Nov 3, 2022
461d433
update schema to use previous Registry type inputs
guineveresaenger Nov 3, 2022
52c6d85
Update unputs in implementation
guineveresaenger Nov 3, 2022
1936267
Make DockerBuild a Type instead
guineveresaenger Nov 4, 2022
510a488
Read Dockerfile and Context from build input
guineveresaenger Nov 4, 2022
e8c4d72
Rename fields to match current Image implementation. Remove context a…
guineveresaenger Nov 4, 2022
958da1f
Make build not required. Implement defaults in image.go for build def…
guineveresaenger Nov 4, 2022
a8119a1
tag valid registry image name on top of local image name
guineveresaenger Nov 4, 2022
77c3702
implement skipPush
guineveresaenger Nov 4, 2022
8a0d91b
schematize the remaining Image fields
guineveresaenger Nov 8, 2022
5421329
Add structs and populate the fields for Image, Build, and Registry
guineveresaenger Nov 9, 2022
0ed4056
remove unnecessary CacheFrom struct
guineveresaenger Nov 9, 2022
5eab7ea
Add BuildArgs
guineveresaenger Nov 9, 2022
d394b9c
fix logic for registry
guineveresaenger Nov 10, 2022
f2d1efc
add extra check for getCachedImages. Also try out a decoder, using EO…
guineveresaenger Nov 10, 2022
6ce1d48
reset back to a print statement for now
guineveresaenger Nov 11, 2022
ff3a88c
--amend
guineveresaenger Nov 11, 2022
4b8df33
SkipRefresh: true for all local build tests. Disable ExtraRuntimeVali…
guineveresaenger Nov 11, 2022
c24d723
clean git tree
guineveresaenger Nov 11, 2022
4ff2d9d
Intercepts push errors. Fixes up info logs to the pulumi CLI.
guineveresaenger Nov 12, 2022
9f64931
linter cleanup
guineveresaenger Nov 14, 2022
6ff12ac
fix mermge conflicts
guineveresaenger Nov 14, 2022
3387358
Unskip node test and remove SkipRefresh
guineveresaenger Nov 16, 2022
407b936
Minimal Read implementation. Add Update functionality. Start Diff imp…
guineveresaenger Nov 16, 2022
3b9b320
Make the URN token for Image be a constant
guineveresaenger Nov 16, 2022
f52d3dd
Implement Diff
guineveresaenger Nov 16, 2022
76ee778
Add an ID field for the resource using imageName
guineveresaenger Nov 16, 2022
8ed1b08
Fix Checkpoint logic for Diff, Create, and Update. Enable Secrets on …
guineveresaenger Nov 16, 2022
e069fb5
Unskip tests
guineveresaenger Nov 16, 2022
1e99ede
linter fixes
guineveresaenger Nov 17, 2022
56c0478
Fix Dotnet type. Fix Go version.
guineveresaenger Nov 17, 2022
c36c9c9
update go veersion in examples folder. Update package dependency for …
guineveresaenger Nov 17, 2022
4791f79
DockerBuild is now DockerBuildArgs
guineveresaenger Nov 17, 2022
252dc60
Add SkipNulls:true
guineveresaenger Nov 17, 2022
661fc2e
skip dotnet test for now
guineveresaenger Nov 17, 2022
43d0178
Unskip test; require Pulumi.Docker.Inputs
guineveresaenger Nov 17, 2022
78f29ba
add a semicolon
guineveresaenger Nov 17, 2022
15a5029
Remove test skip line
guineveresaenger Nov 18, 2022
98eea7f
remove TODOs and add hybrid provider context
guineveresaenger Nov 18, 2022
4277ab9
set Registry in a separate function
guineveresaenger Nov 18, 2022
ada7fdd
make Password secret
guineveresaenger Nov 18, 2022
d1bc212
do not panic
guineveresaenger Nov 18, 2022
924b556
remove duplicate call to Close(); pass along existing Context
guineveresaenger Nov 18, 2022
86b7975
Remove boilerplate cruft
guineveresaenger Nov 18, 2022
57a0ef0
update azure-py example so it at least compiles
guineveresaenger Nov 18, 2022
a81341e
server not registry in registryargs
guineveresaenger Nov 18, 2022
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
9 changes: 6 additions & 3 deletions examples/azure-py/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pulumi
from pulumi_azure import core, containerservice
from pulumi_docker import Image, ImageRegistry, DockerBuild
from pulumi_docker import Image, RegistryArgs, DockerBuildArgs

custom_image = "app"

Expand All @@ -14,6 +14,9 @@
my_image = Image("myimage",
image_name=registry.login_server.apply(
lambda server: f'{server}/{custom_image}:v1.0.0'),
build=DockerBuild(context=f'./{custom_image}'),
registry=ImageRegistry(registry.login_server, registry.admin_username, registry.admin_password)
build=DockerBuildArgs(context=f'./{custom_image}'),
registry=RegistryArgs(
server=registry.login_server,
username=registry.admin_username,
password=registry.admin_password)
)
4 changes: 2 additions & 2 deletions examples/dockerfile-go/main.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package main

import (
"github.com/pulumi/pulumi-docker/sdk/v2/go/docker"
"github.com/pulumi/pulumi/sdk/v2/go/pulumi"
"github.com/pulumi/pulumi-docker/sdk/v3/go/docker"
"github.com/pulumi/pulumi/sdk/v3/go/pulumi"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions examples/dockerfile-py/__main__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import pulumi
from pulumi_docker import Image, DockerBuild
from pulumi_docker import Image, DockerBuildArgs

image = Image(
"my-image",
image_name="pulumi-user/example:v1.0.0",
build=DockerBuild(
build=DockerBuildArgs(
target="dependencies",
env={'TEST_ENV': '42'},
),
Expand Down
3 changes: 2 additions & 1 deletion examples/dotnet/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using Pulumi;
using Pulumi.Docker;
using Pulumi.Docker.Inputs;

class Program
{
Expand All @@ -12,7 +13,7 @@ static Task<int> Main()
var image = new Image("my-image", new ImageArgs
{
ImageName = "pulumi-user/example:v1.0.0",
Build = new DockerBuild
Build = new DockerBuildArgs
{
Env = new Dictionary<string, string>
{
Expand Down
5 changes: 3 additions & 2 deletions examples/examples_dotnet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ func TestNginxCs(t *testing.T) {
}

func TestDotNet(t *testing.T) {
//t.Skip("Skipping test due to updates in Image resource")

test := getCsharpBaseOptions(t).
With(integration.ProgramTestOptions{
Dir: path.Join(getCwd(t), "dotnet"),
ExtraRuntimeValidation: dockerFileWithDependenciesOutputValidation,
Dir: path.Join(getCwd(t), "dotnet"),
})

integration.ProgramTest(t, &test)
Expand Down
6 changes: 2 additions & 4 deletions examples/examples_go_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,16 @@ func TestBuildCacheFromGo(t *testing.T) {
}

func TestDockerfileGo(t *testing.T) {
t.Skip("ignoring due to major version change")
cwd, err := os.Getwd()
if !assert.NoError(t, err) {
t.FailNow()
}

opts := base.With(integration.ProgramTestOptions{
Dependencies: []string{
"github.com/pulumi/pulumi-docker/sdk/v2",
"github.com/pulumi/pulumi-docker/sdk/v3",
},
Dir: path.Join(cwd, "dockerfile-go"),
ExtraRuntimeValidation: dockerFileWithDependenciesOutputValidation,
Dir: path.Join(cwd, "dockerfile-go"),
})
integration.ProgramTest(t, &opts)
}
Expand Down
5 changes: 3 additions & 2 deletions examples/examples_nodejs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
)

func TestAws(t *testing.T) {
t.Skip("Skipping test due to updates in Image resource")
region := os.Getenv("AWS_REGION")
if region == "" {
t.Skipf("Skipping test due to missing AWS_REGION environment variable")
Expand Down Expand Up @@ -53,10 +54,10 @@ func TestNginx(t *testing.T) {
}

func TestDockerfileWithMultipleTargets(t *testing.T) {

test := getJsOptions(t).
With(integration.ProgramTestOptions{
Dir: path.Join(getCwd(t), "dockerfile-with-targets"),
ExtraRuntimeValidation: dockerFileWithDependenciesOutputValidation,
Dir: path.Join(getCwd(t), "dockerfile-with-targets"),
})

integration.ProgramTest(t, &test)
Expand Down
4 changes: 1 addition & 3 deletions examples/examples_py_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,9 @@ func TestNginxPy(t *testing.T) {
}

func TestDockerfilePy(t *testing.T) {
t.Skipf("https://github.com/pulumi/pulumi-docker/issues/411")
test := getPyOptions(t).
With(integration.ProgramTestOptions{
Dir: path.Join(getCwd(t), "dockerfile-py"),
ExtraRuntimeValidation: dockerFileWithDependenciesOutputValidation,
Dir: path.Join(getCwd(t), "dockerfile-py"),
})

integration.ProgramTest(t, &test)
Expand Down
132 changes: 131 additions & 1 deletion examples/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/pulumi/pulumi-docker/examples/v3

go 1.16
go 1.19

require (
github.com/pulumi/pulumi-aws/sdk/v4 v4.14.0
Expand All @@ -11,3 +11,133 @@ require (
github.com/pulumi/pulumi/sdk/v3 v3.17.0
github.com/stretchr/testify v1.6.1
)

require (
cloud.google.com/go v0.81.0 // indirect
cloud.google.com/go/logging v1.0.0 // indirect
cloud.google.com/go/storage v1.15.0 // indirect
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
github.com/Azure/azure-sdk-for-go v54.0.0+incompatible // indirect
github.com/Azure/azure-storage-blob-go v0.13.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
github.com/Azure/go-autorest/autorest/azure/auth v0.5.7 // indirect
github.com/Azure/go-autorest/autorest/azure/cli v0.4.2 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/Masterminds/semver v1.5.0 // indirect
github.com/agext/levenshtein v1.2.1 // indirect
github.com/apparentlymart/go-textseg v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.38.35 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/cheggaaa/pb v1.0.18 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/djherbis/times v1.2.0 // indirect
github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/emirpasic/gods v1.12.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
github.com/gofrs/flock v0.7.1 // indirect
github.com/gofrs/uuid v3.3.0+incompatible // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.3 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/google/wire v0.5.0 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/gorilla/mux v1.7.4 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hcl/v2 v2.3.0 // indirect
github.com/hashicorp/vault/api v1.1.0 // indirect
github.com/hashicorp/vault/sdk v0.2.0 // indirect
github.com/ijc/Gotty v0.0.0-20170406111628-a8b993ba6abd // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.9 // indirect
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/mattn/go-ieproxy v0.0.1 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-runewidth v0.0.8 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/opentracing/basictracer-go v1.0.0 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386 // indirect
github.com/pierrec/lz4 v2.6.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rjeczalik/notify v0.9.2 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94 // indirect
github.com/santhosh-tekuri/jsonschema/v5 v5.0.0 // indirect
github.com/sergi/go-diff v1.1.0 // indirect
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/spf13/cobra v1.0.0 // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/src-d/gcfg v1.4.0 // indirect
github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6 // indirect
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 // indirect
github.com/uber/jaeger-client-go v2.22.1+incompatible // indirect
github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
github.com/xanzy/ssh-agent v0.2.1 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zclconf/go-cty v1.3.1 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
gocloud.dev v0.23.0 // indirect
gocloud.dev/secrets/hashivault v0.23.0 // indirect
golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf // indirect
golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/net v0.0.0-20210505214959-0714010a04ed // indirect
golang.org/x/oauth2 v0.0.0-20210427180440-81ed05c6b58c // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
golang.org/x/tools v0.1.0 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/api v0.46.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210506142907-4a47615972c2 // indirect
google.golang.org/grpc v1.37.0 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/AlecAivazis/survey.v1 v1.8.9-0.20200217094205-6773bdf39b7f // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 // indirect
)
15 changes: 0 additions & 15 deletions examples/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg3
github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
Expand Down Expand Up @@ -219,7 +218,6 @@ github.com/frankban/quicktest v1.10.0 h1:Gfh+GAJZOAoKZsIZeZbdn2JF10kN1XHNvjsvQK8
github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/gedex/inflector v0.0.0-20170307190818-16278e9db813/go.mod h1:P+oSoE9yhSRvsmYyZsshflcR6ePWYLql6UU1amW13IM=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
Expand All @@ -236,7 +234,6 @@ github.com/go-ldap/ldap/v3 v3.1.3/go.mod h1:3rbOH3jRS2u6jg2rJnKAMLE/xQyCKIveG2Sa
github.com/go-ldap/ldap/v3 v3.1.10/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
Expand Down Expand Up @@ -507,8 +504,6 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxschmitt/golang-combinations v1.0.0/go.mod h1:RbMhWvfCelHR6WROvT2bVfxJvZHoEvBj71SKe+H0MYU=
github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
Expand Down Expand Up @@ -595,16 +590,12 @@ github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/shirou/gopsutil v3.21.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
Expand Down Expand Up @@ -633,8 +624,6 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6 h1:9VTskZOIRf2vKF3UL8TuWElry5pgUpV1tFSe/e/0m/E=
github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g=
github.com/tklauser/go-sysconf v0.3.8/go.mod h1:z4zYWRS+X53WUKtBcmDg1comV3fPhdQnzasnIHUoLDU=
github.com/tklauser/numcpus v0.2.3/go.mod h1:vpEPS/JC+oZGGQ/My/vJnNsvMDQL6PwOqt8dsCw5j+E=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/tweekmonster/luser v0.0.0-20161003172636-3fa38070dbd7 h1:X9dsIWPuuEJlPX//UmRKophhOKCGXc46RVIGuttks68=
Expand Down Expand Up @@ -885,8 +874,6 @@ golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2 h1:c8PlLMqBbOHoqtjteWm5/kbe6rNY2pbRfbIMVnepueo=
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
Expand Down Expand Up @@ -1142,10 +1129,8 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
pgregory.net/rapid v0.4.7 h1:MTNRktPuv5FNqOO151TM9mDTa+XHcX6ypYeISDVD14g=
pgregory.net/rapid v0.4.7/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 h1:ucqkfpjg9WzSUubAO62csmucvxl4/JeW3F4I4909XkM=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67/go.mod h1:L5q+DGLGOQFpo1snNEkLOJT2d1YTW66rWNzatr3He1k=
10 changes: 6 additions & 4 deletions provider/cmd/pulumi-resource-docker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,17 @@ package main

import (
_ "embed"

docker "github.com/pulumi/pulumi-docker/provider/v3"
"github.com/pulumi/pulumi-docker/provider/v3"
"github.com/pulumi/pulumi-docker/provider/v3/pkg/version"
"github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge"
)

//go:embed schema-embed.json
var pulumiSchema []byte
var providerName = "docker"

func main() {
tfbridge.Main("docker", version.Version, docker.Provider(), pulumiSchema)
// Instead of calling tfbridge.Main, as is customary for bridged providers,
// in this provider we implement all calls
// so that we can apply native vs bridged logic at every RPC call
provider.Serve(providerName, version.Version, pulumiSchema)
}
Loading