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

New resource - OpenSearch Package & OpenSearch Package Association #33227

Merged
merged 37 commits into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
4ae2dc8
[WIP] - OpenSearchPackage
bschaatsbergen Aug 29, 2023
584c2f4
chore: add `available_package_version`
bschaatsbergen Sep 7, 2023
7c467ce
chore: change package description to optional and fix sdkresource ann…
bschaatsbergen Sep 7, 2023
61a9f93
feat: add `aws_opensearch_package_association`
bschaatsbergen Sep 7, 2023
1c4b60a
chore: remove timeouts from `aws_opensearch_package`
bschaatsbergen Sep 7, 2023
1bab192
chore: add ForceNews to `package_source`
bschaatsbergen Sep 7, 2023
c1166bc
Create opensearch_package.html.markdown
bschaatsbergen Sep 7, 2023
933aef3
chore: remove `Outbound`
bschaatsbergen Sep 7, 2023
e6457bb
Create opensearch_package_association.html.markdown
bschaatsbergen Sep 7, 2023
ed40fdc
Create 33227.txt
bschaatsbergen Sep 7, 2023
1b5dfd2
Create package_test.go
bschaatsbergen Sep 7, 2023
13b137b
chore: temp implement read
bschaatsbergen Sep 7, 2023
0829b91
Create example-opensearch-custom-package.txt
bschaatsbergen Sep 7, 2023
67a8e88
chore: use a test fixture for the custom opensearch packages
bschaatsbergen Sep 7, 2023
247bc96
chore: remove domain check on custom package test
bschaatsbergen Sep 7, 2023
dc6c80c
chore: name aws_opensearch_package test
bschaatsbergen Sep 7, 2023
279673a
chore: ensure unique package names are used
bschaatsbergen Sep 7, 2023
a62c474
Create package_association_test.go
bschaatsbergen Sep 18, 2023
566ef5c
chore: implement `ResourcePackageAssociationRead`
bschaatsbergen Sep 18, 2023
1d4a9f3
chore: add resource attr pair checks
bschaatsbergen Sep 18, 2023
75ec8b9
chore: fix `aws_opensearch_package_association` import example
bschaatsbergen Sep 18, 2023
10e8e96
chore: make gen
bschaatsbergen Sep 18, 2023
d288b10
Merge branch 'main' into opensearch-package
bschaatsbergen Sep 18, 2023
a6780a9
chore: rebase and make gen
bschaatsbergen Sep 18, 2023
61f2826
chore: add testAccCheckPackageDestroy
bschaatsbergen Sep 18, 2023
91e7e2c
chore: run `make testacc-lint-fix`
bschaatsbergen Sep 18, 2023
35c599d
chore: fix extraneous set
bschaatsbergen Sep 18, 2023
9f5ef15
Merge branch 'main' into HEAD
ewbankkit Sep 19, 2023
2f64e3c
Fix terrafmt documentation errors.
ewbankkit Sep 19, 2023
df91e0d
r/aws_opensearch_package: Alphabetize attributes.
ewbankkit Sep 19, 2023
94b92df
r/aws_opensearch_package: Use 'FindPackageByID'.
ewbankkit Sep 19, 2023
291abd0
r/aws_opensearch_package_association: Use 'FindPackageAssociationByTw…
ewbankkit Sep 19, 2023
18ade81
Fix 'testAccCheckPackageDestroy'.
ewbankkit Sep 19, 2023
eec0405
Fix 'ValidationException: 1 validation error detected: Value 'tf-acc-…
ewbankkit Sep 19, 2023
6867850
r/aws_opensearch_package_association: Add waiters.
ewbankkit Sep 19, 2023
5b67068
Correct acceptance tests.
ewbankkit Sep 19, 2023
7cc7abc
Tweak documentation.
ewbankkit Sep 19, 2023
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
7 changes: 7 additions & 0 deletions .changelog/33227.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:new-resource
aws_opensearch_package
```

```release-note:new-resource
aws_opensearch_package_association
```
236 changes: 236 additions & 0 deletions internal/service/opensearch/package.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0

package opensearch

import (
"context"
"log"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/opensearchservice"
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
"github.com/hashicorp/terraform-provider-aws/internal/conns"
"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
)

// @SDKResource("aws_opensearch_package")
func ResourcePackage() *schema.Resource {
return &schema.Resource{
CreateWithoutTimeout: resourcePackageCreate,
ReadWithoutTimeout: resourcePackageRead,
UpdateWithoutTimeout: resourcePackageUpdate,
DeleteWithoutTimeout: resourcePackageDelete,

Importer: &schema.ResourceImporter{
StateContext: schema.ImportStatePassthroughContext,
},

Schema: map[string]*schema.Schema{
"available_package_version": {
Type: schema.TypeString,
Computed: true,
},
"package_description": {
Type: schema.TypeString,
Optional: true,
},
"package_id": {
Type: schema.TypeString,
Computed: true,
},
"package_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringLenBetween(1, 32),
},
"package_source": {
Type: schema.TypeList,
Required: true,
ForceNew: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"s3_bucket_name": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"s3_key": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
},
},
},
"package_type": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice(opensearchservice.PackageType_Values(), false),
},
},
}
}

func resourcePackageCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
var diags diag.Diagnostics
conn := meta.(*conns.AWSClient).OpenSearchConn(ctx)

name := d.Get("package_name").(string)
input := &opensearchservice.CreatePackageInput{
PackageDescription: aws.String(d.Get("package_description").(string)),
PackageName: aws.String(name),
PackageType: aws.String(d.Get("package_type").(string)),
}

if v, ok := d.GetOk("package_source"); ok {
input.PackageSource = expandPackageSource(v.([]interface{})[0].(map[string]interface{}))
}

output, err := conn.CreatePackageWithContext(ctx, input)

if err != nil {
return sdkdiag.AppendErrorf(diags, "creating OpenSearch Package (%s): %s", name, err)
}

d.SetId(aws.StringValue(output.PackageDetails.PackageID))

return append(diags, resourcePackageRead(ctx, d, meta)...)
}

func resourcePackageRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
var diags diag.Diagnostics
conn := meta.(*conns.AWSClient).OpenSearchConn(ctx)

pkg, err := FindPackageByID(ctx, conn, d.Id())

if !d.IsNewResource() && tfresource.NotFound(err) {
log.Printf("[WARN] OpenSearch Package (%s) not found, removing from state", d.Id())
d.SetId("")
return diags
}

if err != nil {
return sdkdiag.AppendErrorf(diags, "reading OpenSearch Package (%s): %s", d.Id(), err)
}

d.Set("available_package_version", pkg.AvailablePackageVersion)
d.Set("package_description", pkg.PackageDescription)
d.Set("package_id", pkg.PackageID)
d.Set("package_name", pkg.PackageName)
d.Set("package_type", pkg.PackageType)

return diags
}

func resourcePackageUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
var diags diag.Diagnostics
conn := meta.(*conns.AWSClient).OpenSearchConn(ctx)

input := &opensearchservice.UpdatePackageInput{
PackageID: aws.String(d.Id()),
PackageDescription: aws.String(d.Get("package_description").(string)),
PackageSource: expandPackageSource(d.Get("package_source").([]interface{})[0].(map[string]interface{})),
}

_, err := conn.UpdatePackageWithContext(ctx, input)

if err != nil {
return sdkdiag.AppendErrorf(diags, "updating OpenSearch Package (%s): %s", d.Id(), err)
}

return append(diags, resourcePackageRead(ctx, d, meta)...)
}

func resourcePackageDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
var diags diag.Diagnostics
conn := meta.(*conns.AWSClient).OpenSearchConn(ctx)

log.Printf("[DEBUG] Deleting OpenSearch Package: %s", d.Id())
_, err := conn.DeletePackageWithContext(ctx, &opensearchservice.DeletePackageInput{
PackageID: aws.String(d.Id()),
})

if tfawserr.ErrCodeEquals(err, opensearchservice.ErrCodeResourceNotFoundException) {
return diags
}

if err != nil {
return sdkdiag.AppendErrorf(diags, "deleting OpenSearch Package (%s): %s", d.Id(), err)
}

return diags
}

func FindPackageByID(ctx context.Context, conn *opensearchservice.OpenSearchService, id string) (*opensearchservice.PackageDetails, error) {
input := &opensearchservice.DescribePackagesInput{
Filters: []*opensearchservice.DescribePackagesFilter{
{
Name: aws.String("PackageID"),
Value: aws.StringSlice([]string{id}),
},
},
}

return findPackage(ctx, conn, input)
}

func findPackage(ctx context.Context, conn *opensearchservice.OpenSearchService, input *opensearchservice.DescribePackagesInput) (*opensearchservice.PackageDetails, error) {
output, err := findPackages(ctx, conn, input)

if err != nil {
return nil, err
}

return tfresource.AssertSinglePtrResult(output)
}

func findPackages(ctx context.Context, conn *opensearchservice.OpenSearchService, input *opensearchservice.DescribePackagesInput) ([]*opensearchservice.PackageDetails, error) {
var output []*opensearchservice.PackageDetails

err := conn.DescribePackagesPagesWithContext(ctx, input, func(page *opensearchservice.DescribePackagesOutput, lastPage bool) bool {
if page == nil {
return !lastPage
}

for _, v := range page.PackageDetailsList {
if v != nil {
output = append(output, v)
}
}

return !lastPage
})

if tfawserr.ErrCodeEquals(err, opensearchservice.ErrCodeResourceNotFoundException) {
return nil, &retry.NotFoundError{
LastError: err,
LastRequest: input,
}
}

if err != nil {
return nil, err
}

return output, nil
}

func expandPackageSource(v interface{}) *opensearchservice.PackageSource {
if v == nil {
return nil
}

return &opensearchservice.PackageSource{
S3BucketName: aws.String(v.(map[string]interface{})["s3_bucket_name"].(string)),
S3Key: aws.String(v.(map[string]interface{})["s3_key"].(string)),
}
}
Loading
Loading