From c8816bc3c0afc04581006ca432c6624ce78d97e4 Mon Sep 17 00:00:00 2001
From: Shawn Hartsell <shawnhartsell@github.com>
Date: Mon, 22 Apr 2024 16:55:53 -0500
Subject: [PATCH] refactoring lint errors

---
 src/push.go           | 18 ++++++++++--------
 src/reponames_test.go | 16 ++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/push.go b/src/push.go
index dd3ce19..e5170e5 100644
--- a/src/push.go
+++ b/src/push.go
@@ -71,11 +71,11 @@ func GetImpersonationToken(ctx context.Context, flags *PushFlags) (string, error
 
 	rootRequest, err := ghClient.NewRequest("GET", enterpriseAPIPath, nil)
 	if err != nil {
-		return "", errors.Wrap(err, "error constructing request for GitHub Enterprise client.")
+		return "", errors.Wrap(err, "error constructing request for GitHub Enterprise client")
 	}
 	rootResponse, err := ghClient.Do(ctx, rootRequest, nil)
 	if err != nil {
-		return "", errors.Wrap(err, "error checking connectivity for GitHub Enterprise client.")
+		return "", errors.Wrap(err, "error checking connectivity for GitHub Enterprise client")
 	}
 
 	scopesHeader := rootResponse.Header.Get(xOAuthScopesHeader)
@@ -96,7 +96,7 @@ func GetImpersonationToken(ctx context.Context, flags *PushFlags) (string, error
 
 	impersonationToken, _, err := ghClient.Admin.CreateUserImpersonation(ctx, flags.ActionsAdminUser, &github.ImpersonateUserOptions{Scopes: []string{minimumRepositoryScope, "workflow"}})
 	if err != nil {
-		return "", errors.Wrap(err, "failed to impersonate Actions admin user.")
+		return "", errors.Wrap(err, "failed to impersonate Actions admin user")
 	}
 
 	fmt.Printf("got the impersonation token for `%s` ...\n", flags.ActionsAdminUser)
@@ -206,10 +206,13 @@ func getOrCreateGitHubRepo(ctx context.Context, client *github.Client, repoName,
 
 	// check if repository already exists
 	ghRepo, resp, err := client.Repositories.Get(ctx, ownerName, repoName)
+	if err != nil {
+		return nil, errors.Wrapf(err, "error creating repository %s/%s", ownerName, repoName)
+	}
 
-	if err == nil {
-		fmt.Printf("Existing repo `%s/%s`\n", ownerName, repoName)
-	} else if resp != nil && resp.StatusCode == 404 {
+	fmt.Printf("Existing repo `%s/%s`\n", ownerName, repoName)
+
+	if resp != nil && resp.StatusCode == 404 {
 		// repo not existing yet - try to create
 		visibility := github.String("public")
 		if isAE {
@@ -230,13 +233,12 @@ func getOrCreateGitHubRepo(ctx context.Context, client *github.Client, repoName,
 		} else {
 			return nil, errors.Wrapf(err, "error creating repository %s/%s", ownerName, repoName)
 		}
-	} else if err != nil {
-		return nil, errors.Wrapf(err, "error creating repository %s/%s", ownerName, repoName)
 	}
 
 	if ghRepo == nil {
 		return nil, errors.New("error repository is nil")
 	}
+
 	return ghRepo, nil
 }
 
diff --git a/src/reponames_test.go b/src/reponames_test.go
index 53e724f..33a5f27 100644
--- a/src/reponames_test.go
+++ b/src/reponames_test.go
@@ -13,12 +13,12 @@ func Test_extractSourceDest(t *testing.T) {
 	assert.Equal(t, "owner/repo", src)
 	assert.Equal(t, "owner/repo", dst)
 
-	src, dst, err = extractSourceDest("src_owner/src_repo:dst_owner/dst_repo")
+	_, dst, err = extractSourceDest("src_owner/src_repo:dst_owner/dst_repo")
 	require.NoError(t, err)
 	assert.Equal(t, "src_owner/src_repo", src)
 	assert.Equal(t, "dst_owner/dst_repo", dst)
 
-	src, dst, err = extractSourceDest("src_owner/src_repo:dst_owner/dst_repo:bogus/bogus")
+	_, _, err = extractSourceDest("src_owner/src_repo:dst_owner/dst_repo:bogus/bogus")
 	require.Error(t, err)
 }
 
@@ -37,24 +37,24 @@ func Test_validateNwo(t *testing.T) {
 	assert.Equal(t, "a/b", nwo)
 
 	// no slash separator
-	nwo, err = validateNwo("bogus")
+	_, err = validateNwo("bogus")
 	require.Error(t, err)
 
 	// no owner
-	nwo, err = validateNwo("/bogus")
+	_, err = validateNwo("/bogus")
 	require.Error(t, err)
 
 	// no repo name
-	nwo, err = validateNwo("bogus/")
+	_, err = validateNwo("bogus/")
 	require.Error(t, err)
 
-	nwo, err = validateNwo("bogus whitespace/bogus")
+	_, err = validateNwo("bogus whitespace/bogus")
 	require.Error(t, err)
 
-	nwo, err = validateNwo("bogus/bogus/bogus")
+	_, err = validateNwo("bogus/bogus/bogus")
 	require.Error(t, err)
 
 	// A separate destination is only permitted for "repo names", not NWOs.
-	nwo, err = validateNwo("owner/repo:bogus/bogus")
+	_, err = validateNwo("owner/repo:bogus/bogus")
 	require.Error(t, err)
 }