Skip to content

Commit

Permalink
Merge pull request #28144 from hashicorp/f-resource-explorer-index
Browse files Browse the repository at this point in the history
r/aws_resourceexplorer2_index: New resource
  • Loading branch information
ewbankkit committed Dec 5, 2022
2 parents be9fb0a + d7e9f6a commit 4e5c0e2
Show file tree
Hide file tree
Showing 15 changed files with 836 additions and 21 deletions.
3 changes: 3 additions & 0 deletions .changelog/28144.txt
@@ -0,0 +1,3 @@
```release-note:new-resource
aws_resourceexplorer2_index
```
1 change: 1 addition & 0 deletions go.mod
Expand Up @@ -42,6 +42,7 @@ require (
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/hcl/v2 v2.15.0
github.com/hashicorp/terraform-plugin-framework v0.17.0
github.com/hashicorp/terraform-plugin-framework-timeouts v0.2.0
github.com/hashicorp/terraform-plugin-framework-validators v0.7.0
github.com/hashicorp/terraform-plugin-go v0.14.2
github.com/hashicorp/terraform-plugin-log v0.7.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Expand Up @@ -208,6 +208,8 @@ github.com/hashicorp/terraform-json v0.14.0 h1:sh9iZ1Y8IFJLx+xQiKHGud6/TSUCM0N8e
github.com/hashicorp/terraform-json v0.14.0/go.mod h1:5A9HIWPkk4e5aeeXIBbkcOvaZbIYnAIkEyqP2pNSckM=
github.com/hashicorp/terraform-plugin-framework v0.17.0 h1:0KUOY/oe1GPLFqaXnKDnd1rhCrnUtt8pV9wGEwNUFlU=
github.com/hashicorp/terraform-plugin-framework v0.17.0/go.mod h1:FV97t2BZOARkL7NNlsc/N25c84MyeSSz72uPp7Vq1lg=
github.com/hashicorp/terraform-plugin-framework-timeouts v0.2.0 h1:qo+9WNxAg9UlD0NHoOhi6GJOjQKN6b+JLZJOZ5Nqr8g=
github.com/hashicorp/terraform-plugin-framework-timeouts v0.2.0/go.mod h1:jIV0yknjnzb3Al+DRMtr25BPlQq8LLoy+36bYQduIg8=
github.com/hashicorp/terraform-plugin-framework-validators v0.7.0 h1:tIYOMNmEMQIc6mwun8nX3e5U3TkgZg1TpXRlBEBQHwY=
github.com/hashicorp/terraform-plugin-framework-validators v0.7.0/go.mod h1:e1RKREyEVdd3FK8Jfgz8L/ThQgcJKLb4ZJxNzsuIH0A=
github.com/hashicorp/terraform-plugin-go v0.14.2 h1:rhsVEOGCnY04msNymSvbUsXfRLKh9znXZmHlf5e8mhE=
Expand Down
2 changes: 2 additions & 0 deletions internal/provider/provider.go
Expand Up @@ -153,6 +153,7 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/service/redshift"
"github.com/hashicorp/terraform-provider-aws/internal/service/redshiftdata"
"github.com/hashicorp/terraform-provider-aws/internal/service/redshiftserverless"
"github.com/hashicorp/terraform-provider-aws/internal/service/resourceexplorer2"
"github.com/hashicorp/terraform-provider-aws/internal/service/resourcegroups"
"github.com/hashicorp/terraform-provider-aws/internal/service/resourcegroupstaggingapi"
"github.com/hashicorp/terraform-provider-aws/internal/service/rolesanywhere"
Expand Down Expand Up @@ -2256,6 +2257,7 @@ func New(_ context.Context) (*schema.Provider, error) {
globalaccelerator.ServicePackageData,
medialive.ServicePackageData,
meta.ServicePackageData,
resourceexplorer2.ServicePackageData,
simpledb.ServicePackageData,
sts.ServicePackageData,
},
Expand Down
7 changes: 1 addition & 6 deletions internal/service/ec2/vpc_security_group_ingress_rule.go
Expand Up @@ -137,12 +137,7 @@ func (r *resourceSecurityGroupRule) Schema(ctx context.Context, req resource.Sch
int64validator.Between(-1, 65535),
},
},
"id": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
},
},
"id": framework.IDAttribute(),
"ip_protocol": schema.StringAttribute{
Required: true,
PlanModifiers: []planmodifier.String{
Expand Down
7 changes: 7 additions & 0 deletions internal/service/resourceexplorer2/exports_test.go
@@ -0,0 +1,7 @@
package resourceexplorer2

// Exports for use in tests only.
var (
FindIndex = findIndex
ResourceIndex = newResourceIndex
)
5 changes: 5 additions & 0 deletions internal/service/resourceexplorer2/generate.go
@@ -0,0 +1,5 @@
//go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -TagInIDElem=ResourceArn -ListTags -ListTagsInIDElem=ResourceArn -ServiceTagsMap -UpdateTags -UntagInTagsElem=TagKeys -KVTValues -SkipTypesImp
//go:generate go run ../../generate/servicepackagedata/main.go
// ONLY generate directives and package declaration! Do not add anything else to this file.

package resourceexplorer2

0 comments on commit 4e5c0e2

Please sign in to comment.