-
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 #25199 from hashicorp/f-kendra-thesaurus
r/kendra_thesaurus: new resource
- Loading branch information
Showing
11 changed files
with
1,301 additions
and
26 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,3 @@ | ||
| ```release-note:new-resource | ||
| aws_kendra_thesaurus | ||
| ``` |
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,39 @@ | ||
| package kendra | ||
|
|
||
| import ( | ||
| "context" | ||
| "errors" | ||
|
|
||
| "github.com/aws/aws-sdk-go-v2/aws" | ||
| "github.com/aws/aws-sdk-go-v2/service/kendra" | ||
| "github.com/aws/aws-sdk-go-v2/service/kendra/types" | ||
| "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" | ||
| "github.com/hashicorp/terraform-provider-aws/internal/tfresource" | ||
| ) | ||
|
|
||
| func FindThesaurusByID(ctx context.Context, conn *kendra.Client, id, indexId string) (*kendra.DescribeThesaurusOutput, error) { | ||
| in := &kendra.DescribeThesaurusInput{ | ||
| Id: aws.String(id), | ||
| IndexId: aws.String(indexId), | ||
| } | ||
|
|
||
| out, err := conn.DescribeThesaurus(ctx, in) | ||
|
|
||
| var resourceNotFoundException *types.ResourceNotFoundException | ||
| if errors.As(err, &resourceNotFoundException) { | ||
| return nil, &resource.NotFoundError{ | ||
| LastError: err, | ||
| LastRequest: in, | ||
| } | ||
| } | ||
|
|
||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if out == nil { | ||
| return nil, tfresource.NewEmptyResultError(in) | ||
| } | ||
|
|
||
| return out, nil | ||
| } |
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,16 @@ | ||
| package kendra | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "strings" | ||
| ) | ||
|
|
||
| func ThesaurusParseResourceID(id string) (string, string, error) { | ||
| parts := strings.Split(id, "/") | ||
|
|
||
| if len(parts) != 2 || parts[0] == "" || parts[1] == "" { | ||
| return "", "", fmt.Errorf("please make sure ID is in format THESAURUS_ID/INDEX_ID") | ||
| } | ||
|
|
||
| return parts[0], parts[1], nil | ||
| } |
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,75 @@ | ||
| package kendra_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| tfkendra "github.com/hashicorp/terraform-provider-aws/internal/service/kendra" | ||
| ) | ||
|
|
||
| func TestThesaurusParseResourceID(t *testing.T) { | ||
| testCases := []struct { | ||
| TestName string | ||
| Input string | ||
| ExpectedId string | ||
| ExpectedIndexId string | ||
| Error bool | ||
| }{ | ||
| { | ||
| TestName: "empty", | ||
| Input: "", | ||
| ExpectedId: "", | ||
| ExpectedIndexId: "", | ||
| Error: true, | ||
| }, | ||
| { | ||
| TestName: "Invalid ID", | ||
| Input: "abcdefg12345678/", | ||
| ExpectedId: "", | ||
| ExpectedIndexId: "", | ||
| Error: true, | ||
| }, | ||
| { | ||
| TestName: "Invalid ID separator", | ||
| Input: "abcdefg12345678:qwerty09876", | ||
| ExpectedId: "", | ||
| ExpectedIndexId: "", | ||
| Error: true, | ||
| }, | ||
| { | ||
| TestName: "Invalid ID with more than 1 separator", | ||
| Input: "abcdefg12345678/qwerty09876/zxcvbnm123456", | ||
| ExpectedId: "", | ||
| ExpectedIndexId: "", | ||
| Error: true, | ||
| }, | ||
| { | ||
| TestName: "Valid ID", | ||
| Input: "abcdefg12345678/qwerty09876", | ||
| ExpectedId: "abcdefg12345678", | ||
| ExpectedIndexId: "qwerty09876", | ||
| Error: false, | ||
| }, | ||
| } | ||
|
|
||
| for _, testCase := range testCases { | ||
| t.Run(testCase.TestName, func(t *testing.T) { | ||
| gotId, gotIndexId, err := tfkendra.ThesaurusParseResourceID(testCase.Input) | ||
|
|
||
| if err != nil && !testCase.Error { | ||
| t.Errorf("got error (%s), expected no error", err) | ||
| } | ||
|
|
||
| if err == nil && testCase.Error { | ||
| t.Errorf("got (Id: %s, IndexId: %s) and no error, expected error", gotId, gotIndexId) | ||
| } | ||
|
|
||
| if gotId != testCase.ExpectedId { | ||
| t.Errorf("got %s, expected %s", gotId, testCase.ExpectedIndexId) | ||
| } | ||
|
|
||
| if gotIndexId != testCase.ExpectedIndexId { | ||
| t.Errorf("got %s, expected %s", gotIndexId, testCase.ExpectedIndexId) | ||
| } | ||
| }) | ||
| } | ||
| } |
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
Oops, something went wrong.