From e48c47a1532458e7245099a5ca8d5a886a743c14 Mon Sep 17 00:00:00 2001 From: Rebecca Date: Tue, 22 Sep 2026 11:25:03 -0700 Subject: [PATCH] refactor(host): remove dead dryRunValidation function and its tests --- plugin/service/host/plugin.go | 24 -------------- plugin/service/host/plugin_test.go | 51 ------------------------------ 2 files changed, 75 deletions(-) diff --git a/plugin/service/host/plugin.go b/plugin/service/host/plugin.go index db16211..e9697ef 100644 --- a/plugin/service/host/plugin.go +++ b/plugin/service/host/plugin.go @@ -19,8 +19,6 @@ import ( "github.com/hashicorp/boundary-plugin-aws/internal/credential" "github.com/hashicorp/boundary-plugin-aws/internal/errors" pb "github.com/hashicorp/boundary/sdk/pbs/plugin" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/structpb" ) @@ -849,28 +847,6 @@ func ec2ClientForTarget( return ec2.NewFromConfig(targetCfg, ec2Opts...), nil } -// dryRunValidation performs an AWS DescribeInstances call to verify the state's -// credentials, the host listing functionality as well as the filters, if any -// are passed in. This function can therefore be used for both host catalog and -// host set validation. -func dryRunValidation(ctx context.Context, state *awsCatalogPersistedState, ec2Opts []ec2Option, filters ...types.Filter) *status.Status { - if state == nil { - return status.New(codes.InvalidArgument, "persisted state is required") - } - - ec2Client, err := state.EC2Client(ctx, ec2Opts...) - if err != nil { - return status.New(codes.InvalidArgument, fmt.Sprintf("error getting EC2 client: %s", err)) - } - - _, err = ec2Client.DescribeInstances(ctx, &ec2.DescribeInstancesInput{Filters: filters}) - if err != nil { - return status.New(codes.FailedPrecondition, fmt.Sprintf("aws describe instances failed: %s", err)) - } - - return nil -} - // appendDistinct will append the elements to the slice // if an element is not nil, empty, and does not exist in slice. func appendDistinct(slice []string, elems ...*string) []string { diff --git a/plugin/service/host/plugin_test.go b/plugin/service/host/plugin_test.go index 48582f4..e80f435 100644 --- a/plugin/service/host/plugin_test.go +++ b/plugin/service/host/plugin_test.go @@ -3083,54 +3083,3 @@ func TestAppendDistinct(t *testing.T) { }) } } - -func TestDryRunValidation(t *testing.T) { - t.Run("nil credential state", func(t *testing.T) { - st := dryRunValidation(context.Background(), nil, nil) - require.NotNil(t, st) - require.Equal(t, codes.InvalidArgument.String(), st.Code().String()) - require.Equal(t, "persisted state is required", st.Message()) - }) - - t.Run("ec2ClientErr", func(t *testing.T) { - st := dryRunValidation(context.Background(), &awsCatalogPersistedState{ - AwsCredentialPersistedState: &credential.AwsCredentialPersistedState{ - CredentialsConfig: &awsutil.CredentialsConfig{}, - }, - testEC2APIFunc: func(...aws.Config) (EC2API, error) { - return nil, fmt.Errorf("oops ec2 client err") - }, - }, []ec2Option{}) - require.NotNil(t, st) - require.Equal(t, codes.InvalidArgument.String(), st.Code().String()) - require.Equal(t, "error getting EC2 client: oops ec2 client err", st.Message()) - }) - - t.Run("describeInstancesErr", func(t *testing.T) { - st := dryRunValidation(context.Background(), &awsCatalogPersistedState{ - AwsCredentialPersistedState: &credential.AwsCredentialPersistedState{ - CredentialsConfig: &awsutil.CredentialsConfig{ - AccessKey: "AKIAfoo", - SecretKey: "baz", - }, - }, - testEC2APIFunc: newTestMockEC2(nil, testMockEC2WithDescribeInstancesError(fmt.Errorf("oops describe instances error"))), - }, []ec2Option{}) - require.NotNil(t, st) - require.Equal(t, codes.FailedPrecondition.String(), st.Code().String()) - require.Equal(t, "aws describe instances failed: oops describe instances error", st.Message()) - }) - - t.Run("success", func(t *testing.T) { - st := dryRunValidation(context.Background(), &awsCatalogPersistedState{ - AwsCredentialPersistedState: &credential.AwsCredentialPersistedState{ - CredentialsConfig: &awsutil.CredentialsConfig{ - AccessKey: "AKIAfoo", - SecretKey: "baz", - }, - }, - testEC2APIFunc: newTestMockEC2(nil, testMockEC2WithDescribeInstancesOutput(&ec2.DescribeInstancesOutput{})), - }, []ec2Option{}) - require.Nil(t, st) - }) -}