fix: remove unused code and cleanup golangci-lint violations

ekristen · May 18, 2024 · 2fc5c5e · 2fc5c5e
1 parent f8fddc5
commit 2fc5c5e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/resources/compute-disk.go b/resources/compute-disk.go
@@ -74,8 +74,9 @@ func (l *ComputeDiskLister) List(ctx context.Context, o interface{}) ([]resource
 
 			resources = append(resources, &ComputeDisk{
 				svc:     l.svc,
-				Name:    resp.Name,
 				project: opts.Project,
+				region:  opts.Region,
+				Name:    resp.Name,
 				Zone:    ptr.String(zone),
 				Arch:    resp.Architecture,
 				Size:    resp.SizeGb,

diff --git a/resources/iam-service-account.go b/resources/iam-service-account.go
@@ -90,7 +90,6 @@ type IAMServiceAccount struct {
 	svc         *iamadmin.IamClient
 	settings    *settings.Setting
 	project     *string
-	region      *string
 	fullName    *string
 	ID          *string
 	Name        *string

diff --git a/resources/kms-key.go b/resources/kms-key.go
@@ -112,33 +112,13 @@ func (l *KMSKeyLister) List(ctx context.Context, o interface{}) ([]resource.Reso
 type KMSKey struct {
 	svc      *kms.KeyManagementClient
 	project  *string
-	region   *string
 	fullName *string
 	Name     *string
 	Keyring  *string
 	State    *string
 }
 
 func (r *KMSKey) Remove(ctx context.Context) error {
-	/*
-		_, err := r.svc.UpdateCryptoKey(ctx, &kmspb.UpdateCryptoKeyRequest{
-			CryptoKey: &kmspb.CryptoKey{
-				Name: *r.fullName,
-				DestroyScheduledDuration: &durationpb.Duration{
-					Seconds: 0,
-					Nanos:   0,
-				},
-			},
-			UpdateMask: &fieldmaskpb.FieldMask{
-				Paths: []string{"destroy_scheduled_duration"},
-			},
-		})
-		if err != nil {
-			logrus.WithError(err).Debug("unable to update crypto key")
-			return err
-		}
-	*/
-
 	reqKeyVersions := &kmspb.ListCryptoKeyVersionsRequest{
 		Parent: *r.fullName,
 	}

diff --git a/resources/secretmanager-secret.go b/resources/secretmanager-secret.go
@@ -86,7 +86,6 @@ func (l *SecretManagerSecretLister) List(ctx context.Context, o interface{}) ([]
 type SecretManagerSecret struct {
 	svc        *secretmanager.Client
 	project    *string
-	region     *string
 	fullName   *string
 	Name       *string
 	CreateTime time.Time