-
Notifications
You must be signed in to change notification settings - Fork 9.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #29097 from GlennChia/f-aws_networkmanager_core_ne…
…twork_policy_attachment r/aws_networkmanager_core_network_policy_attachment
- Loading branch information
Showing
8 changed files
with
805 additions
and
84 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| ```release-note:new-resource | ||
| aws_networkmanager_core_network_policy_attachment | ||
| ``` | ||
|
|
||
| ```release-note:enhancement | ||
| resource/aws_networkmanager_core_network: Add `base_policy_region` and `create_base_policy` arguments | ||
| ``` | ||
|
|
||
| ```release-note:note | ||
| resource/aws_networkmanager_core_network: The `policy_document` attribute is being deprecated in favor of the new `aws_networkmanager_core_network_policy_attachment` resource. | ||
| ``` | ||
|
|
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
124 changes: 124 additions & 0 deletions
124
internal/service/networkmanager/core_network_policy_attachment.go
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,124 @@ | ||
| package networkmanager | ||
|
|
||
| import ( | ||
| "context" | ||
| "log" | ||
| "regexp" | ||
| "time" | ||
|
|
||
| "github.com/aws/aws-sdk-go/private/protocol" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/diag" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/conns" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/tfresource" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/verify" | ||
| ) | ||
|
|
||
| func ResourceCoreNetworkPolicyAttachment() *schema.Resource { | ||
| return &schema.Resource{ | ||
| CreateWithoutTimeout: resourceCoreNetworkPolicyAttachmentCreate, | ||
| ReadWithoutTimeout: resourceCoreNetworkPolicyAttachmentRead, | ||
| UpdateWithoutTimeout: resourceCoreNetworkPolicyAttachmentUpdate, | ||
| DeleteWithoutTimeout: schema.NoopContext, | ||
|
|
||
| Importer: &schema.ResourceImporter{ | ||
| StateContext: schema.ImportStatePassthroughContext, | ||
| }, | ||
|
|
||
| Timeouts: &schema.ResourceTimeout{ | ||
| Update: schema.DefaultTimeout(30 * time.Minute), | ||
| }, | ||
|
|
||
| Schema: map[string]*schema.Schema{ | ||
| "core_network_id": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ForceNew: true, | ||
| ValidateFunc: validation.All( | ||
| validation.StringLenBetween(0, 50), | ||
| validation.StringMatch(regexp.MustCompile(`^core-network-([0-9a-f]{8,17})$`), "must be a valid Core Network ID"), | ||
| ), | ||
| }, | ||
| "policy_document": { | ||
| Type: schema.TypeString, | ||
| Required: true, | ||
| ValidateFunc: validation.All( | ||
| validation.StringLenBetween(0, 10000000), | ||
| validation.StringIsJSON, | ||
| ), | ||
| DiffSuppressFunc: verify.SuppressEquivalentJSONDiffs, | ||
| StateFunc: func(v interface{}) string { | ||
| json, _ := structure.NormalizeJsonString(v) | ||
| return json | ||
| }, | ||
| }, | ||
| "state": { | ||
| Type: schema.TypeString, | ||
| Computed: true, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func resourceCoreNetworkPolicyAttachmentCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
| d.SetId(d.Get("core_network_id").(string)) | ||
|
|
||
| return resourceCoreNetworkPolicyAttachmentUpdate(ctx, d, meta) | ||
| } | ||
|
|
||
| func resourceCoreNetworkPolicyAttachmentRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
| conn := meta.(*conns.AWSClient).NetworkManagerConn() | ||
|
|
||
| coreNetwork, err := FindCoreNetworkByID(ctx, conn, d.Id()) | ||
|
|
||
| if !d.IsNewResource() && tfresource.NotFound(err) { | ||
| log.Printf("[WARN] Network Manager Core Network %s not found, removing from state", d.Id()) | ||
| d.SetId("") | ||
| return nil | ||
| } | ||
|
|
||
| if err != nil { | ||
| return diag.Errorf("reading Network Manager Core Network (%s): %s", d.Id(), err) | ||
| } | ||
|
|
||
| d.Set("core_network_id", coreNetwork.CoreNetworkId) | ||
| d.Set("state", coreNetwork.State) | ||
|
|
||
| // getting the policy document uses a different API call | ||
| coreNetworkPolicy, err := FindCoreNetworkPolicyByID(ctx, conn, d.Id()) | ||
|
|
||
| if tfresource.NotFound(err) { | ||
| d.Set("policy_document", nil) | ||
| } else if err != nil { | ||
| return diag.Errorf("reading Network Manager Core Network (%s) policy: %s", d.Id(), err) | ||
| } else { | ||
| encodedPolicyDocument, err := protocol.EncodeJSONValue(coreNetworkPolicy.PolicyDocument, protocol.NoEscape) | ||
|
|
||
| if err != nil { | ||
| return diag.Errorf("encoding Network Manager Core Network (%s) policy document: %s", d.Id(), err) | ||
| } | ||
|
|
||
| d.Set("policy_document", encodedPolicyDocument) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func resourceCoreNetworkPolicyAttachmentUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
| conn := meta.(*conns.AWSClient).NetworkManagerConn() | ||
|
|
||
| if d.HasChange("policy_document") { | ||
| err := PutAndExecuteCoreNetworkPolicy(ctx, conn, d.Id(), d.Get("policy_document").(string)) | ||
|
|
||
| if err != nil { | ||
| return diag.FromErr(err) | ||
| } | ||
|
|
||
| if _, err := waitCoreNetworkUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil { | ||
| return diag.Errorf("waiting for Network Manager Core Network (%s) update: %s", d.Id(), err) | ||
| } | ||
| } | ||
|
|
||
| return resourceCoreNetworkPolicyAttachmentRead(ctx, d, meta) | ||
| } |
Oops, something went wrong.