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.

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

Jump to bottom

Fix import resources with provider default tags #4169

Merged
merged 18 commits into from
Jul 23, 2024
Merged

Fix import resources with provider default tags #4169

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
276cafb
Fix import resources with provider default tags
corymhall Jul 3, 2024
e573c99
skip test
corymhall Jul 3, 2024
0063967
fixing test
corymhall Jul 3, 2024
18cc1c4
Adding more tests
corymhall Jul 10, 2024
892e985
Merge remote-tracking branch 'origin/master' into corymhall/default-t…
corymhall Jul 10, 2024
e24dbfa
Add a note
corymhall Jul 10, 2024
7852b77
trying to fix upstream
corymhall Jul 10, 2024
28ff3a5
run go mod tidy
corymhall Jul 10, 2024
9095918
adding parallel to tests
corymhall Jul 11, 2024
6a9f36c
Merge branch 'master' into corymhall/default-tags-import
corymhall Jul 15, 2024
5f51229
Fixing tests
corymhall Jul 15, 2024
54a9732
fixing spelling
corymhall Jul 15, 2024
25b4b15
adding pf tests to some additional tags tests
corymhall Jul 18, 2024
d4c01b7
Merge remote-tracking branch 'origin/master' into corymhall/default-t…
corymhall Jul 18, 2024
185f434
adding test for .get methods
corymhall Jul 18, 2024
e84e096
run go mod tidy
corymhall Jul 18, 2024
5fe2ef0
Merge branch 'master' into corymhall/default-tags-import
corymhall Jul 23, 2024
8c72e64
updating based on comments
corymhall Jul 23, 2024
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
14 changes: 7 additions & 7 deletions patches/0038-Restore-legacy-bucket.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Restore legacy bucket


diff --git a/go.mod b/go.mod
index 6d14fe0fc8..af57d1b01c 100644
index f2ebf59e9a..aabe9bd190 100644
corymhall marked this conversation as resolved.
Show resolved Hide resolved
--- a/go.mod
+++ b/go.mod
@@ -206,6 +206,7 @@ require (
@@ -212,6 +212,7 @@ require (
github.com/gertd/go-pluralize v0.2.1
github.com/google/go-cmp v0.6.0
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0
Expand All @@ -17,18 +17,18 @@ index 6d14fe0fc8..af57d1b01c 100644
github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.55
github.com/hashicorp/awspolicyequivalence v1.6.0
diff --git a/go.sum b/go.sum
index 40e2a0dc1c..9a012867fb 100644
index d53e627b88..9e16d60b55 100644
--- a/go.sum
+++ b/go.sum
@@ -475,6 +475,7 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
@@ -487,6 +487,7 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
@@ -494,6 +495,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -506,6 +507,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0 h1:l16/Vrl0+x+HjHJWEjcKPwHYoxN9EC78gAFXKlH6m84=
github.com/hashicorp/aws-cloudformation-resource-schema-sdk-go v0.23.0/go.mod h1:HAmscHyzSOfB1Dr16KLc177KNbn83wscnZC+N7WyaM8=
Expand All @@ -37,15 +37,15 @@ index 40e2a0dc1c..9a012867fb 100644
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.54 h1:O37FpbmkDSmSPgukMJLAzJzo5WBSFQx0iwn4PlY6BKI=
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.54/go.mod h1:TJ+Mz49cn0zKURLX5haphWDbmGWz15OsEiLp1CcXDwY=
github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2 v2.0.0-beta.55 h1:7izXD15MCmPcWbKJ5qAwcSlnWvTwkioIJkq0+OJIJG0=
@@ -569,6 +572,7 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
@@ -581,6 +584,7 @@ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
+github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -681,6 +685,7 @@ golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
@@ -693,6 +697,7 @@ golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
Expand Down
6 changes: 3 additions & 3 deletions patches/0045-restore-ECRConn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ Subject: [PATCH] restore ECRConn


diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
index 376b5d52b1..d8d7b71f2c 100644
index 0a7c294203..2bd46def60 100644
--- a/internal/conns/awsclient_gen.go
+++ b/internal/conns/awsclient_gen.go
@@ -201,6 +201,7 @@ import (
@@ -207,6 +207,7 @@ import (
directconnect_sdkv1 "github.com/aws/aws-sdk-go/service/directconnect"
directoryservice_sdkv1 "github.com/aws/aws-sdk-go/service/directoryservice"
ec2_sdkv1 "github.com/aws/aws-sdk-go/service/ec2"
+ ecr_sdkv1 "github.com/aws/aws-sdk-go/service/ecr"
ecs_sdkv1 "github.com/aws/aws-sdk-go/service/ecs"
efs_sdkv1 "github.com/aws/aws-sdk-go/service/efs"
elasticache_sdkv1 "github.com/aws/aws-sdk-go/service/elasticache"
@@ -597,6 +598,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client {
@@ -602,6 +603,10 @@ func (c *AWSClient) EC2Client(ctx context.Context) *ec2_sdkv2.Client {
return errs.Must(client[*ec2_sdkv2.Client](ctx, c, names.EC2, make(map[string]any)))
}

Expand Down
4 changes: 2 additions & 2 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ module github.com/pulumi/pulumi-aws/provider/v6
go 1.22.5

require (
github.com/aws/aws-sdk-go-v2 v1.30.1
github.com/aws/aws-sdk-go-v2/config v1.27.23
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9
github.com/aws/aws-sdk-go-v2/service/appconfig v1.31.1
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.33.1
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.54
Expand Down Expand Up @@ -65,7 +67,6 @@ require (
github.com/armon/go-radix v1.0.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aws/aws-sdk-go v1.54.13 // indirect
github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.23 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.4 // indirect
Expand All @@ -81,7 +82,6 @@ require (
github.com/aws/aws-sdk-go-v2/service/amplify v1.23.1 // indirect
github.com/aws/aws-sdk-go-v2/service/apigateway v1.25.1 // indirect
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.22.1 // indirect
github.com/aws/aws-sdk-go-v2/service/appconfig v1.31.1 // indirect
github.com/aws/aws-sdk-go-v2/service/appfabric v1.9.1 // indirect
github.com/aws/aws-sdk-go-v2/service/appflow v1.43.1 // indirect
github.com/aws/aws-sdk-go-v2/service/appintegrations v1.27.1 // indirect
Expand Down
25 changes: 2 additions & 23 deletions provider/provider_python_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,12 @@
package provider

import (
"bytes"
"context"
"fmt"
"path/filepath"
"strings"
"testing"
"time"

"github.com/pulumi/pulumi/pkg/v3/testing/integration"
"github.com/stretchr/testify/require"
)

func TestRegress3196(t *testing.T) {
Expand Down Expand Up @@ -61,7 +57,6 @@ func TestRegress3887(t *testing.T) {

// Make sure that importing an AWS targetGroup succeeds.
func TestRegress2534(t *testing.T) {
ctx := context.Background()
ptest := pulumiTest(t, filepath.Join("test-programs", "regress-2534"))
upResult := ptest.Up()
targetGroupArn := upResult.Outputs["targetGroupArn"].Value.(string)
Expand All @@ -71,24 +66,8 @@ func TestRegress2534(t *testing.T) {
workdir := workspace.WorkDir()
t.Logf("workdir = %s", workdir)

exec := func(args ...string) {
var env []string
for k, v := range workspace.GetEnvVars() {
env = append(env, fmt.Sprintf("%s=%s", k, v))
}
stdin := bytes.NewReader([]byte{})
var arguments []string
arguments = append(arguments, args...)
arguments = append(arguments, "-s", ptest.CurrentStack().Name())
s1, s2, code, err := workspace.PulumiCommand().Run(ctx, workdir, stdin, nil, nil, env, arguments...)
t.Logf("import stdout: %s", s1)
t.Logf("import stderr: %s", s2)
t.Logf("code=%v", code)
require.NoError(t, err)
}

exec("import", "aws:lb/targetGroup:TargetGroup", "newtg", targetGroupArn, "--yes")
exec("state", "unprotect", strings.ReplaceAll(targetGroupUrn, "::test", "::newtg"), "--yes")
execPulumi(t, ptest, workdir, "import", "aws:lb/targetGroup:TargetGroup", "newtg", targetGroupArn, "--yes")
execPulumi(t, ptest, workdir, "state", "unprotect", strings.ReplaceAll(targetGroupUrn, "::test", "::newtg"), "--yes")
}

func getPythonBaseOptions(t *testing.T) integration.ProgramTestOptions {
Expand Down
20 changes: 20 additions & 0 deletions provider/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
package provider

import (
"bytes"
"context"
"encoding/json"
"fmt"
"os"
Expand Down Expand Up @@ -34,6 +36,24 @@ func getEnvRegion(t *testing.T) string {
return envRegion
}

func execPulumi(t *testing.T, ptest *pulumitest.PulumiTest, workdir string, args ...string) {
ctx := context.Background()
var env []string
workspace := ptest.CurrentStack().Workspace()
for k, v := range workspace.GetEnvVars() {
env = append(env, fmt.Sprintf("%s=%s", k, v))
}
stdin := bytes.NewReader([]byte{})
var arguments []string
arguments = append(arguments, args...)
arguments = append(arguments, "-s", ptest.CurrentStack().Name())
s1, s2, code, err := workspace.PulumiCommand().Run(ctx, workdir, stdin, nil, nil, env, arguments...)
t.Logf("import stdout: %s", s1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not necessarily import at this point, right? some arbitrary pulumi command stdout

t.Logf("import stderr: %s", s2)
t.Logf("code=%v", code)
require.NoError(t, err)
}

type testProviderUpgradeOptions struct {
baselineVersion string
linkNodeSDK bool
Expand Down
Loading
Loading