-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updates pulumi/terraform-diff-reader dependency (#1246)
The new pulumi/terraform-diff-reader v0.0.1 version has a workaround for pulumi/pulumi-aws#1423 and should fix it once the pulumi-aws provider upgrades to the new bridge version. A regression test is included.
- Loading branch information
Showing
9 changed files
with
175 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| // Copyright 2016-2023, Pulumi Corporation. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package tests | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
|
|
||
| testutils "github.com/pulumi/pulumi-terraform-bridge/testing/x" | ||
| "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfbridge" | ||
| shimv2 "github.com/pulumi/pulumi-terraform-bridge/v3/pkg/tfshim/sdk-v2" | ||
| ) | ||
|
|
||
| func TestRegressAws1423(t *testing.T) { | ||
| ctx := context.Background() | ||
|
|
||
| emptySchema := func() *schema.Schema { | ||
| return &schema.Schema{ | ||
| Type: schema.TypeList, | ||
| Optional: true, | ||
| MaxItems: 1, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{}, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| resource := &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| "rule": { | ||
| Type: schema.TypeSet, | ||
| Optional: true, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "name": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| }, | ||
| "override": { | ||
| Type: schema.TypeList, | ||
| Optional: true, | ||
| MaxItems: 1, | ||
| Elem: &schema.Resource{ | ||
| Schema: map[string]*schema.Schema{ | ||
| "count": emptySchema(), | ||
| "none": emptySchema(), | ||
| }, | ||
| }, | ||
| }, | ||
| "priority": { | ||
| Type: schema.TypeInt, | ||
| Required: true, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| tfProvider := &schema.Provider{ | ||
| Schema: map[string]*schema.Schema{}, | ||
| ResourcesMap: map[string]*schema.Resource{ | ||
| "aws_wafv2_web_acl": resource, | ||
| }, | ||
| } | ||
|
|
||
| p := shimv2.NewProvider(tfProvider) // , shimv2.WithDiffStrategy(shimv2.PlanState)) | ||
|
|
||
| info := tfbridge.ProviderInfo{ | ||
| P: p, | ||
| Name: "aws", | ||
| Description: "A Pulumi package for creating and managing Amazon Web Services (AWS) cloud resources.", | ||
| Keywords: []string{"pulumi", "aws"}, | ||
| License: "Apache-2.0", | ||
| Homepage: "https://pulumi.io", | ||
| Repository: "https://github.com/phillipedwards/pulumi-aws", | ||
| Version: "0.0.2", | ||
| Resources: map[string]*tfbridge.ResourceInfo{ | ||
| "aws_wafv2_web_acl": {Tok: "aws:wafv2/webAcl:WebAcl"}, | ||
| }, | ||
| } | ||
|
|
||
| server := tfbridge.NewProvider(ctx, | ||
| nil, /* hostClient */ | ||
| "aws", /* module */ | ||
| "", /* version */ | ||
| p, /* tf */ | ||
| info, /* info */ | ||
| []byte{}, /* pulumiSchema */ | ||
| ) | ||
|
|
||
| testCase := ` | ||
| { | ||
| "method": "/pulumirpc.ResourceProvider/Create", | ||
| "request": { | ||
| "urn": "urn:pulumi:dev::bridge-887::aws:wafv2/webAcl:WebAcl::aclw", | ||
| "properties": { | ||
| "__defaults": [ | ||
| "name" | ||
| ], | ||
| "name": "aclw-a956aa7", | ||
| "rules": [ | ||
| { | ||
| "__defaults": [], | ||
| "name": "rule-1", | ||
| "priority": 0, | ||
| "override": { | ||
| "__defaults": [], | ||
| "count": { | ||
| "__defaults": [] | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "preview": true | ||
| }, | ||
| "response": { | ||
| "properties": { | ||
| "id": "*", | ||
| "name": "aclw-a956aa7", | ||
| "rules": [ | ||
| { | ||
| "name": "rule-1", | ||
| "override": { | ||
| "count": {}, | ||
| "none": null | ||
| }, | ||
| "priority": 0 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }` | ||
| testutils.Replay(t, server, testCase) | ||
| } |