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

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 all 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
26 changes: 25 additions & 1 deletion examples/examples_go_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ func (st tagsState) validateStateResult(phase int) func(
return func(t *testing.T, stack integration.RuntimeValidationStackInfo) {
for k, v := range stack.Outputs {
switch k {
case "bucket-name", "legacy-bucket-name", "appconfig-app-arn":
case "bucket-name", "legacy-bucket-name", "appconfig-app-arn", "appconfig-env-arn", "get-appconfig-env":
continue
}

Expand All @@ -251,12 +251,18 @@ func (st tagsState) validateStateResult(phase int) func(
t.Logf("key=%s tags are as expected: %v", k, actualTagsJSON)

if k == "bucket" {
// TODO: uncomment when https://github.com/pulumi/pulumi-aws/issues/4258 is fixed
// getTags := stack.Outputs["get-bucket"].(string)
// assert.Equal(t, v.(string), getTags)
bucketName := stack.Outputs["bucket-name"].(string)
st.assertTagsEqualWithRetry(t,
fetchBucketTags(bucketName),
"bad bucket tags")
}
if k == "legacy-bucket" {
// TODO: uncomment when https://github.com/pulumi/pulumi-aws/issues/4258 is fixed
// getTags := stack.Outputs["get-legacy-bucket"].(string)
Copy link
Member

Choose a reason for hiding this comment

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

Are these comments still useful?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added another comment with link to the issue. When the issue is fixed the code can be uncommented.

// assert.Equal(t, v.(string), getTags)
bucketName := stack.Outputs["legacy-bucket-name"].(string)
st.assertTagsEqualWithRetry(t,
fetchBucketTags(bucketName),
Expand All @@ -268,10 +274,28 @@ func (st tagsState) validateStateResult(phase int) func(
fetchAppConfigTags(arn),
"bad appconfig app tags")
}
if k == "appconfig-env" {
getTags := stack.Outputs["get-appconfig-env"].(string)
isEqual(t, v.(string), getTags)
arn := stack.Outputs["appconfig-env-arn"].(string)
st.assertTagsEqualWithRetry(t,
fetchAppConfigTags(arn),
"bad appconfig app tags")
}
}
}
}

func isEqual(t *testing.T, a, b string) {
if a == "null" {
a = "{}"
}
if b == "null" {
b = "{}"
}
assert.Equal(t, a, b)
}

func fetchBucketTags(awsBucket string) tagsFetcher {
return func() (map[string]string, error) {
sess := session.Must(session.NewSessionWithOptions(session.Options{
Expand Down
29 changes: 29 additions & 0 deletions examples/tags-combinations-go/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,41 @@ func main() {
return err
}

env, err := appconfig.NewEnvironment(ctx, "testappconfigenv"+testIdent, &appconfig.EnvironmentArgs{
ApplicationId: app.ID(),
Tags: tagsMap,
}, pulumi.Provider(p))
if err != nil {
return err
}

getEnv, err := appconfig.GetEnvironment(ctx, "get-testappconfigenv"+testIdent, env.ID(), &appconfig.EnvironmentState{}, pulumi.Provider(p))
if err != nil {
return err
}

// TODO: uncomment when https://github.com/pulumi/pulumi-aws/issues/4258 is fixed
// refresh doesn't work for `forceDelete` & `acl`
// getBucket, err := s3.GetBucketV2(ctx, "get-bucketv2"+testIdent, bucket.ID(), &s3.BucketV2State{}, pulumi.Provider(p), pulumi.IgnoreChanges([]string{"forceDestroy", "acl"}))
// if err != nil {
// return err
// }
// getLegacyBucket, err := s3.GetBucket(ctx, "get-legacybucket"+testIdent, legacyBucket.ID(), &s3.BucketState{}, pulumi.Provider(p), pulumi.IgnoreChanges([]string{"forceDestroy", "acl"}))
// if err != nil {
// return err
// }

ctx.Export("bucket", exportTags(bucket.Tags))
// ctx.Export("get-bucket", exportTags(getBucket.Tags))
ctx.Export("legacy-bucket", exportTags(legacyBucket.Tags))
// ctx.Export("get-legacy-bucket", exportTags(getLegacyBucket.Tags))
ctx.Export("bucket-name", bucket.Bucket)
ctx.Export("legacy-bucket-name", legacyBucket.Bucket)
ctx.Export("appconfig-app", exportTags(app.Tags))
ctx.Export("appconfig-app-arn", app.Arn)
ctx.Export("appconfig-env", exportTags(env.Tags))
ctx.Export("get-appconfig-env", exportTags(getEnv.Tags))
ctx.Export("appconfig-env-arn", env.Arn)

return nil
})
Expand Down
29 changes: 29 additions & 0 deletions examples/tags-combinations-go/step1/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,41 @@ func main() {
return err
}

env, err := appconfig.NewEnvironment(ctx, "testappconfigenv"+testIdent, &appconfig.EnvironmentArgs{
ApplicationId: app.ID(),
Tags: tagsMap,
}, pulumi.Provider(p))
if err != nil {
return err
}

getEnv, err := appconfig.GetEnvironment(ctx, "get-testappconfigenv"+testIdent, env.ID(), &appconfig.EnvironmentState{}, pulumi.Provider(p))
if err != nil {
return err
}

// TODO: uncomment when https://github.com/pulumi/pulumi-aws/issues/4258 is fixed
// refresh doesn't work for `forceDelete` & `acl`
// getBucket, err := s3.GetBucketV2(ctx, "get-bucketv2"+testIdent, bucket.ID(), &s3.BucketV2State{}, pulumi.Provider(p))
// if err != nil {
// return err
// }
// getLegacyBucket, err := s3.GetBucket(ctx, "get-legacybucket"+testIdent, legacyBucket.ID(), &s3.BucketState{}, pulumi.Provider(p))
// if err != nil {
// return err
// }

ctx.Export("bucket", exportTags(bucket.Tags))
// ctx.Export("get-bucket", exportTags(getBucket.Tags))
ctx.Export("legacy-bucket", exportTags(legacyBucket.Tags))
// ctx.Export("get-legacy-bucket", exportTags(getLegacyBucket.Tags))
ctx.Export("bucket-name", bucket.Bucket)
ctx.Export("legacy-bucket-name", legacyBucket.Bucket)
ctx.Export("appconfig-app", exportTags(app.Tags))
ctx.Export("appconfig-app-arn", app.Arn)
ctx.Export("appconfig-env", exportTags(env.Tags))
ctx.Export("get-appconfig-env", exportTags(getEnv.Tags))
ctx.Export("appconfig-env-arn", env.Arn)

return nil
})
Expand Down
6 changes: 3 additions & 3 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ module github.com/pulumi/pulumi-aws/provider/v6
go 1.22.5

require (
github.com/aws/aws-sdk-go-v2 v1.30.3
github.com/aws/aws-sdk-go-v2/config v1.27.26
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11
github.com/aws/aws-sdk-go-v2/service/appconfig v1.31.3
github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.33.3
github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.23.3
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.54
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
Expand Down Expand Up @@ -65,7 +68,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.18 // indirect
github.com/aws/aws-sdk-go-v2 v1.30.3 // 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.26 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.7 // indirect
Expand All @@ -81,7 +83,6 @@ require (
github.com/aws/aws-sdk-go-v2/service/amplify v1.23.3 // indirect
github.com/aws/aws-sdk-go-v2/service/apigateway v1.25.3 // indirect
github.com/aws/aws-sdk-go-v2/service/apigatewayv2 v1.22.3 // indirect
github.com/aws/aws-sdk-go-v2/service/appconfig v1.31.3 // indirect
github.com/aws/aws-sdk-go-v2/service/appfabric v1.9.3 // indirect
github.com/aws/aws-sdk-go-v2/service/appflow v1.43.3 // indirect
github.com/aws/aws-sdk-go-v2/service/appintegrations v1.27.3 // indirect
Expand Down Expand Up @@ -229,7 +230,6 @@ require (
github.com/aws/aws-sdk-go-v2/service/rekognition v1.43.2 // indirect
github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.12.3 // indirect
github.com/aws/aws-sdk-go-v2/service/resourcegroups v1.24.3 // indirect
github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi v1.23.3 // indirect
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.13.3 // indirect
github.com/aws/aws-sdk-go-v2/service/route53 v1.42.3 // indirect
github.com/aws/aws-sdk-go-v2/service/route53domains v1.25.3 // 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("stdout: %s", s1)
t.Logf("stderr: %s", s2)
t.Logf("code=%v", code)
require.NoError(t, err)
}

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