From 58da0462cc21084b9b29b22deabc4ed60ab49366 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Wed, 25 Oct 2023 15:18:42 -0400 Subject: [PATCH] chore: Lint corrections --- internal/service/eks/cluster.go | 78 ++++++++++--------------- internal/service/eks/fargate_profile.go | 2 +- internal/service/eks/node_group.go | 2 +- internal/service/eks/status.go | 48 --------------- 4 files changed, 33 insertions(+), 97 deletions(-) diff --git a/internal/service/eks/cluster.go b/internal/service/eks/cluster.go index d12c3b29aac3..fed5a6800cf7 100644 --- a/internal/service/eks/cluster.go +++ b/internal/service/eks/cluster.go @@ -535,12 +535,12 @@ func resourceClusterDelete(ctx context.Context, d *schema.ResourceData, meta int _, err = client.DeleteCluster(ctx, input) - if errs.IsA[*types.ResourceInUseException](err) { - return retry.RetryableError(err) - } - if err != nil { - return retry.NonRetryableError(err) + if errs.IsA[*types.ResourceInUseException](err) { + return retry.RetryableError(err) + } else { + return retry.NonRetryableError(err) + } } return nil @@ -550,19 +550,19 @@ func resourceClusterDelete(ctx context.Context, d *schema.ResourceData, meta int _, err = client.DeleteCluster(ctx, input) } - if errs.IsA[*types.ResourceNotFoundException](err) { - return nil - } - - // Sometimes the EKS API returns the ResourceNotFound error in this form: - // ClientException: No cluster found for name: tf-acc-test-0o1f8 - if errs.IsA[*types.ClientException](err) { - if strings.Contains(err.Error(), "No cluster found for name:") { + if err != nil { + if errs.IsA[*types.ResourceNotFoundException](err) { return nil } - } - if err != nil { + // Sometimes the EKS API returns the ResourceNotFound error in this form: + // ClientException: No cluster found for name: tf-acc-test-0o1f8 + if errs.IsA[*types.ClientException](err) { + if strings.Contains(err.Error(), "No cluster found for name:") { + return nil + } + } + return diag.Errorf("deleting EKS Cluster (%s): %s", d.Id(), err) } @@ -586,24 +586,24 @@ func FindClusterByName(ctx context.Context, client *eks.Client, name string) (*t output, err := client.DescribeCluster(ctx, input) - // Sometimes the EKS API returns the ResourceNotFound error in this form: - // ClientException: No cluster found for name: tf-acc-test-0o1f8 - if errs.IsA[*types.ResourceNotFoundException](err) { - return nil, &retry.NotFoundError{ - LastError: err, - LastRequest: input, - } - } - if errs.IsA[*types.ClientException](err) { - if strings.Contains(err.Error(), "No cluster found for name:") { + if err != nil { + // Sometimes the EKS API returns the ResourceNotFound error in this form: + // ClientException: No cluster found for name: tf-acc-test-0o1f8 + if errs.IsA[*types.ResourceNotFoundException](err) { return nil, &retry.NotFoundError{ LastError: err, LastRequest: input, } } - } + if errs.IsA[*types.ClientException](err) { + if strings.Contains(err.Error(), "No cluster found for name:") { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: input, + } + } + } - if err != nil { return nil, err } @@ -640,22 +640,6 @@ func findClusterUpdateByTwoPartKey(ctx context.Context, client *eks.Client, name return output.Update, nil } -func statusCluster(ctx context.Context, client *eks.Client, name string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { - output, err := FindClusterByName(ctx, client, name) - - if tfresource.NotFound(err) { - return nil, "", nil - } - - if err != nil { - return nil, "", err - } - - return output, string(output.Status), nil - } -} - func statusClusterUpdate(ctx context.Context, client *eks.Client, name, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := findClusterUpdateByTwoPartKey(ctx, client, name, id) @@ -806,13 +790,13 @@ func expandVPCConfigRequestForCreate(tfList []interface{}) *types.VpcConfigReque securityGroupIds := flex.ExpandStringSet(m["security_group_ids"].(*schema.Set)) securityGroupIdsSlice := make([]string, len(securityGroupIds)) for i, id := range securityGroupIds { - securityGroupIdsSlice[i] = *id + securityGroupIdsSlice[i] = aws.ToString(id) } subnetIds := flex.ExpandStringSet(m["subnet_ids"].(*schema.Set)) subnetIdsSlice := make([]string, len(subnetIds)) for i, id := range subnetIds { - subnetIdsSlice[i] = *id + subnetIdsSlice[i] = aws.ToString(id) } vpcConfigRequest := &types.VpcConfigRequest{ @@ -826,7 +810,7 @@ func expandVPCConfigRequestForCreate(tfList []interface{}) *types.VpcConfigReque publicAccessCidrs := flex.ExpandStringSet(v) vpcConfigRequest.PublicAccessCidrs = make([]string, len(publicAccessCidrs)) for i, cidr := range publicAccessCidrs { - vpcConfigRequest.PublicAccessCidrs[i] = *cidr + vpcConfigRequest.PublicAccessCidrs[i] = aws.ToString(cidr) } } @@ -849,7 +833,7 @@ func expandVPCConfigRequestForUpdate(tfList []interface{}) *types.VpcConfigReque publicAccessCidrs := flex.ExpandStringSet(v) vpcConfigRequest.PublicAccessCidrs = make([]string, len(publicAccessCidrs)) for i, cidr := range publicAccessCidrs { - vpcConfigRequest.PublicAccessCidrs[i] = *cidr + vpcConfigRequest.PublicAccessCidrs[i] = aws.ToString(cidr) } } diff --git a/internal/service/eks/fargate_profile.go b/internal/service/eks/fargate_profile.go index a4addb0176ea..c1b91a325db9 100644 --- a/internal/service/eks/fargate_profile.go +++ b/internal/service/eks/fargate_profile.go @@ -285,7 +285,7 @@ func expandFargateProfileSelectors(l []interface{}) []types.FargateProfileSelect fargateProfileSelector.Labels = make(map[string]string) for key, value := range flex.ExpandStringMap(v) { val := value - fargateProfileSelector.Labels[key] = *val + fargateProfileSelector.Labels[key] = aws.ToString(val) } } diff --git a/internal/service/eks/node_group.go b/internal/service/eks/node_group.go index 586e20529d2e..e240a6991511 100644 --- a/internal/service/eks/node_group.go +++ b/internal/service/eks/node_group.go @@ -478,7 +478,7 @@ func resourceNodeGroupUpdate(ctx context.Context, d *schema.ResourceData, meta i input := &eks.UpdateNodegroupVersionInput{ ClientRequestToken: aws.String(id.UniqueId()), ClusterName: aws.String(clusterName), - Force: *aws.Bool(d.Get("force_update_version").(bool)), + Force: d.Get("force_update_version").(bool), NodegroupName: aws.String(nodeGroupName), } diff --git a/internal/service/eks/status.go b/internal/service/eks/status.go index bf237126344d..57103a5500b4 100644 --- a/internal/service/eks/status.go +++ b/internal/service/eks/status.go @@ -11,22 +11,6 @@ import ( "github.com/hashicorp/terraform-provider-aws/internal/tfresource" ) -func statusAddon(ctx context.Context, client *eks.Client, clusterName, addonName string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { - output, err := FindAddonByClusterNameAndAddonName(ctx, client, clusterName, addonName) - - if tfresource.NotFound(err) { - return nil, "", nil - } - - if err != nil { - return nil, "", err - } - - return output, string(output.Status), nil - } -} - func statusAddonUpdate(ctx context.Context, client *eks.Client, clusterName, addonName, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := FindAddonUpdateByClusterNameAddonNameAndID(ctx, client, clusterName, addonName, id) @@ -43,38 +27,6 @@ func statusAddonUpdate(ctx context.Context, client *eks.Client, clusterName, add } } -func statusFargateProfile(ctx context.Context, client *eks.Client, clusterName, fargateProfileName string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { - output, err := FindFargateProfileByClusterNameAndFargateProfileName(ctx, client, clusterName, fargateProfileName) - - if tfresource.NotFound(err) { - return nil, "", nil - } - - if err != nil { - return nil, "", err - } - - return output, string(output.Status), nil - } -} - -func statusNodegroup(ctx context.Context, client *eks.Client, clusterName, nodeGroupName string) retry.StateRefreshFunc { - return func() (interface{}, string, error) { - output, err := FindNodegroupByClusterNameAndNodegroupName(ctx, client, clusterName, nodeGroupName) - - if tfresource.NotFound(err) { - return nil, "", nil - } - - if err != nil { - return nil, "", err - } - - return output, string(output.Status), nil - } -} - func statusNodegroupUpdate(ctx context.Context, client *eks.Client, clusterName, nodeGroupName, id string) retry.StateRefreshFunc { return func() (interface{}, string, error) { output, err := FindNodegroupUpdateByClusterNameNodegroupNameAndID(ctx, client, clusterName, nodeGroupName, id)