chore: delete current user service accounts

Author: Enda Phelan

pkg/cmd/serviceaccount/resetcredentials/reset_credentials.go

@@ -109,16 +109,14 @@ func runResetCredentials(opts *options) (err error) {
 
 	api := conn.API()
 
-	serviceacct, httpRes, err := api.ServiceAccount().GetServiceAccountById(opts.Context, opts.id).Execute()
+	_, httpRes, err := api.ServiceAccount().GetServiceAccountById(opts.Context, opts.id).Execute()
 	if httpRes != nil {
 		defer httpRes.Body.Close()
 	}
 
 	if err != nil {
 		return err
 	}
-	serviceAcctName := serviceacct.GetName()
-
 	if opts.interactive {
 		err = runInteractivePrompt(opts)
 		if err != nil {
@@ -152,7 +150,7 @@ func runResetCredentials(opts *options) (err error) {
 		}
 	}
 
-	updatedServiceAccount, err := resetCredentials(serviceAcctName, opts)
+	updatedServiceAccount, err := resetCredentials(opts)
 	if err != nil {
 		return fmt.Errorf("%v: %w", opts.localizer.MustLocalize("serviceAccount.resetCredentials.error.resetError", localize.NewEntry("ID", opts.id)), err)
 	}
@@ -181,7 +179,7 @@ func runResetCredentials(opts *options) (err error) {
 	return nil
 }
 
-func resetCredentials(name string, opts *options) (*kafkamgmtclient.ServiceAccount, error) {
+func resetCredentials(opts *options) (*kafkamgmtclient.ServiceAccount, error) {
 	conn, err := opts.Connection(connection.DefaultConfigSkipMasAuth)
 	if err != nil {
 		return nil, err

pkg/editor/linux.go

@@ -1,3 +1,5 @@
+// nolint
+
 // +build !windows
 
 package editor

pkg/serviceaccount/validation/validation.go

@@ -10,9 +10,9 @@ import (
 const (
 	// name validation rules
 	legalShortDescriptionChars = "^[a-z]([-a-z0-9]*[a-z0-9])?$"
-	maxNameLength  = 50
-	minNameLength  = 1
-	legalUUID      = "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
+	maxNameLength              = 50
+	minNameLength              = 1
+	legalUUID                  = "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"
 )
 
 // Validator is a type for validating service account configuration values

pkg/serviceaccount/validation/validation_test.go

@@ -16,7 +16,7 @@ func init() {
 	}
 }
 
-func TestValidateName(t *testing.T) {
+func TestValidateShortDescription(t *testing.T) {
 	type args struct {
 		val interface{}
 	}
@@ -75,7 +75,7 @@ func TestValidateName(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if err := validator.ValidateShortDescription(tt.args.val); (err != nil) != tt.wantErr {
-				t.Errorf("ValidateName() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("ValidateShortDescription() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})
 	}
@@ -131,54 +131,3 @@ func TestValidateUUID(t *testing.T) {
 		})
 	}
 }
-
-func TestValidateDescription(t *testing.T) {
-	type args struct {
-		val interface{}
-	}
-	tests := []struct {
-		name    string
-		args    args
-		wantErr bool
-	}{
-		{
-			name:    "passes when empty",
-			args:    args{""},
-			wantErr: false,
-		},
-		{
-			name:    "passes on max length (255)",
-			args:    args{"trl1rmcyl6dp4xxqy0rwudhodbpjc4crja8ibf2yco6obalko6qor9n2a1wsqruolg0ewrndumw2xkezzuwg8pjo6ntsmi1cjw99hjcko4t2kjkxmaswzgk8ko75pcs4js0pzypuyjxxnld4dijxadzs8peioi6d5jjxxtfl9vicufmxuacvu7m8ycbwhsbiu9ipw5fxplf0ojs8bxd7hwt4rn4phbcdgivxdzprhyfjamkgjzytjz25cmqagtw"},
-			wantErr: false,
-		},
-		{
-			name:    "fails when exceeds max length",
-			args:    args{"trl1rmcyl6dp4xxqy0rwudhodbpjc4crja8ibf2yco6obalko6qor9n2a1wsqruolg0ewrndumw2xkezzuwg8pjo6ntsmi1cjw99hjcko4t2kjkxmaswzgk8ko75pcs4js0pzypuyjxxnld4dijxadzs8peioi6d5jjxxtfl9vicufmxuacvu7m8ycbwhsbiu9ipw5fxplf0ojs8bxd7hwt4rn4phbcdgivxdzprhyfjamkgjzytjz25cmqagtwa"},
-			wantErr: true,
-		},
-		{
-			name:    "passes with spaces",
-			args:    args{"here is a description"},
-			wantErr: false,
-		},
-		{
-			name:    "fails with special character",
-			args:    args{"here is a description!"},
-			wantErr: true,
-		},
-		{
-			name:    "passes with capital letters",
-			args:    args{"Hello"},
-			wantErr: false,
-		},
-	}
-
-	for _, tt := range tests {
-		// nolint:scopelint
-		t.Run(tt.name, func(t *testing.T) {
-			if err := validator.ValidateDescription(tt.args.val); (err != nil) != tt.wantErr {
-				t.Errorf("ValidateDescription() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}

scripts/util/delete-service-accounts.sh

@@ -4,9 +4,9 @@ set -uo pipefail
 
 echo "Deleting all service accounts"
 
-serviceaccount_uuids=$(rhoas serviceaccount list -o json | jq -rc '.items[].id')
+serviceaccount_uuids=$(rhoas service-account list -o json | jq --arg iamwho $(rhoas whoami) -rc '.items[] | select( .owner == $iamwho)' | jq -rc '.id')
 
 for id in ${serviceaccount_uuids}; do
   echo "Deleting service account '$id'..."
-  rhoas serviceaccount delete -y --id $id
+  rhoas service-account delete -y --id $id
 done