actions/actions-sync
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactoring lint errors

Browse Source
This commit is contained in:
Shawn Hartsell
2024-04-22 16:55:53 -05:00
parent 6030864125
commit c8816bc3c0
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/push.go
+10 -8
View File
@@ -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
}
src/reponames_test.go
+8 -8
View File
@@ -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)
}