From d10e2d6bbe863826b72eafaf1ab4f8d2a9601a80 Mon Sep 17 00:00:00 2001 From: Wally Guzman <3623426+WallyGuzman@users.noreply.github.com> Date: Mon, 3 Aug 2026 20:55:05 -0500 Subject: [PATCH] Bump google/go-github and shurcooL/githubv4 packages - Migrate existing table logic to latest versions - Minor modifications for deprecations and API changes - Run `go mod tidy` to prune unused dependencies - Also run `gofmt` on all files to resolve linting issues --- github/errors.go | 2 +- github/models/team.go | 18 +++++------ github/stargazer_utils.go | 2 +- github/table_github_actions_artifact.go | 6 ++-- github/table_github_actions_cache.go | 6 ++-- ...ble_github_actions_environment_variable.go | 24 ++------------- ...le_github_actions_organization_variable.go | 2 +- .../table_github_actions_repository_runner.go | 6 ++-- .../table_github_actions_repository_secret.go | 2 +- ...able_github_actions_repository_variable.go | 2 +- ..._github_actions_repository_workflow_job.go | 2 +- ..._github_actions_repository_workflow_run.go | 2 +- github/table_github_audit_log.go | 2 +- github/table_github_code_owner.go | 2 +- github/table_github_gist.go | 2 +- github/table_github_gitignore.go | 4 +-- github/table_github_my_gist.go | 2 +- github/table_github_organization.go | 2 +- ...table_github_organization_collaborators.go | 2 +- ...le_github_organization_dependabot_alert.go | 2 +- github/table_github_package.go | 2 +- github/table_github_package_version.go | 2 +- github/table_github_rate_limit.go | 2 +- github/table_github_release.go | 2 +- github/table_github_repository.go | 2 +- ...able_github_repository_dependabot_alert.go | 2 +- github/table_github_repository_sbom.go | 4 +-- github/table_github_search_code.go | 2 +- github/table_github_search_commit.go | 2 +- github/table_github_search_label.go | 2 +- github/table_github_search_topic.go | 2 +- github/table_github_traffic_clone_daily.go | 2 +- github/table_github_traffic_clone_weekly.go | 2 +- github/table_github_traffic_view_daily.go | 2 +- github/table_github_traffic_view_weekly.go | 2 +- github/table_github_tree.go | 2 +- github/table_github_workflow.go | 2 +- github/tag_utils.go | 2 +- github/utils.go | 30 +++++++++++-------- go.mod | 10 +++---- go.sum | 21 +++++-------- 41 files changed, 87 insertions(+), 104 deletions(-) diff --git a/github/errors.go b/github/errors.go index 596152b..43050ee 100644 --- a/github/errors.go +++ b/github/errors.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" ) diff --git a/github/models/team.go b/github/models/team.go index 9b144a7..a6aa013 100644 --- a/github/models/team.go +++ b/github/models/team.go @@ -8,15 +8,15 @@ import ( type Team struct { basicIdentifiers - AvatarUrl string `graphql:"avatarUrl @include(if:$includeTeamAvatarUrl)" json:"avatar_url"` - CombinedSlug string `graphql:"combinedSlug @include(if:$includeTeamCombinedSlug)" json:"combined_slug"` - CreatedAt time.Time `graphql:"createdAt @include(if:$includeTeamCreatedAt)" json:"created_at"` - Description string `graphql:"description @include(if:$includeTeamDescription)" json:"description"` - EditTeamUrl string `graphql:"editTeamUrl @include(if:$includeTeamEditTeamUrl)" json:"edit_team_url"` - MembersUrl string `graphql:"membersUrl @include(if:$includeTeamMembersUrl)" json:"members_url"` - NewTeamUrl string `graphql:"newTeamUrl @include(if:$includeTeamNewTeamUrl)" json:"new_team_url"` - Organization BasicOrganization `json:"organization"` - ParentTeam struct { + AvatarUrl string `graphql:"avatarUrl @include(if:$includeTeamAvatarUrl)" json:"avatar_url"` + CombinedSlug string `graphql:"combinedSlug @include(if:$includeTeamCombinedSlug)" json:"combined_slug"` + CreatedAt time.Time `graphql:"createdAt @include(if:$includeTeamCreatedAt)" json:"created_at"` + Description string `graphql:"description @include(if:$includeTeamDescription)" json:"description"` + EditTeamUrl string `graphql:"editTeamUrl @include(if:$includeTeamEditTeamUrl)" json:"edit_team_url"` + MembersUrl string `graphql:"membersUrl @include(if:$includeTeamMembersUrl)" json:"members_url"` + NewTeamUrl string `graphql:"newTeamUrl @include(if:$includeTeamNewTeamUrl)" json:"new_team_url"` + Organization BasicOrganization `json:"organization"` + ParentTeam struct { basicIdentifiers Slug string `json:"slug,omitempty"` } `graphql:"parentTeam @include(if:$includeTeamParentTeam)" json:"parent_team"` diff --git a/github/stargazer_utils.go b/github/stargazer_utils.go index 038a9d8..fcd81a6 100644 --- a/github/stargazer_utils.go +++ b/github/stargazer_utils.go @@ -44,4 +44,4 @@ func strHydrateUser(_ context.Context, _ *plugin.QueryData, h *plugin.HydrateDat return nil, err } return str.Node, nil -} \ No newline at end of file +} diff --git a/github/table_github_actions_artifact.go b/github/table_github_actions_artifact.go index 8c09855..e202c40 100644 --- a/github/table_github_actions_artifact.go +++ b/github/table_github_actions_artifact.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" @@ -46,7 +46,9 @@ func tableGitHubArtifactList(ctx context.Context, d *plugin.QueryData, h *plugin fullName := d.EqualsQuals["repository_full_name"].GetStringValue() owner, repo := parseRepoFullName(fullName) - opts := &github.ListOptions{PerPage: 100} + opts := &github.ListArtifactsOptions{ + ListOptions: github.ListOptions{PerPage: 100}, + } limit := d.QueryContext.Limit if limit != nil { diff --git a/github/table_github_actions_cache.go b/github/table_github_actions_cache.go index 04b1104..8f15322 100644 --- a/github/table_github_actions_cache.go +++ b/github/table_github_actions_cache.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" @@ -48,10 +48,10 @@ func tableGitHubCacheList(ctx context.Context, d *plugin.QueryData, h *plugin.Hy ListOptions: github.ListOptions{PerPage: 100}, } if key := d.EqualsQualString("key"); key != "" { - opts.Key = github.String(key) + opts.Key = &key } if ref := d.EqualsQualString("ref"); ref != "" { - opts.Ref = github.String(ref) + opts.Ref = &ref } limit := d.QueryContext.Limit diff --git a/github/table_github_actions_environment_variable.go b/github/table_github_actions_environment_variable.go index 0547704..5f271b1 100644 --- a/github/table_github_actions_environment_variable.go +++ b/github/table_github_actions_environment_variable.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" @@ -43,15 +43,6 @@ func tableGitHubEnvVariableList(ctx context.Context, d *plugin.QueryData, h *plu owner, repo := parseRepoFullName(repoFullName) - // Get repository to obtain its ID - repository, _, err := client.Repositories.Get(ctx, owner, repo) - if err != nil { - return nil, err - } - if repository == nil || repository.ID == nil { - return nil, nil - } - opts := &github.ListOptions{PerPage: 100} limit := d.QueryContext.Limit @@ -62,7 +53,7 @@ func tableGitHubEnvVariableList(ctx context.Context, d *plugin.QueryData, h *plu } for { - variables, resp, err := client.Actions.ListEnvVariables(ctx, int(*repository.ID), environmentName, opts) + variables, resp, err := client.Actions.ListEnvVariables(ctx, owner, repo, environmentName, opts) if err != nil { return nil, err } @@ -103,22 +94,13 @@ func tableGitHubEnvVariableGet(ctx context.Context, d *plugin.QueryData, h *plug client := connect(ctx, d) - // Get repository to obtain its ID - repository, _, err := client.Repositories.Get(ctx, owner, repo) - if err != nil { - return nil, err - } - if repository == nil || repository.ID == nil { - return nil, nil - } - type GetResponse struct { variable *github.ActionsVariable resp *github.Response } getDetails := func(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { - detail, resp, err := client.Actions.GetEnvVariable(ctx, int(*repository.ID), environmentName, name) + detail, resp, err := client.Actions.GetEnvVariable(ctx, owner, repo, environmentName, name) return GetResponse{ variable: detail, resp: resp, diff --git a/github/table_github_actions_organization_variable.go b/github/table_github_actions_organization_variable.go index a96ea49..e052910 100644 --- a/github/table_github_actions_organization_variable.go +++ b/github/table_github_actions_organization_variable.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_actions_repository_runner.go b/github/table_github_actions_repository_runner.go index 57e398c..3c7557e 100644 --- a/github/table_github_actions_repository_runner.go +++ b/github/table_github_actions_repository_runner.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" @@ -42,7 +42,9 @@ func tableGitHubRunnerList(ctx context.Context, d *plugin.QueryData, h *plugin.H orgName := d.EqualsQuals["repository_full_name"].GetStringValue() owner, repo := parseRepoFullName(orgName) - opts := &github.ListOptions{PerPage: 100} + opts := &github.ListRunnersOptions{ + ListOptions: github.ListOptions{PerPage: 100}, + } limit := d.QueryContext.Limit if limit != nil { diff --git a/github/table_github_actions_repository_secret.go b/github/table_github_actions_repository_secret.go index dbaf4c7..8c0bdb4 100644 --- a/github/table_github_actions_repository_secret.go +++ b/github/table_github_actions_repository_secret.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_actions_repository_variable.go b/github/table_github_actions_repository_variable.go index 22d1540..5d58921 100644 --- a/github/table_github_actions_repository_variable.go +++ b/github/table_github_actions_repository_variable.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_actions_repository_workflow_job.go b/github/table_github_actions_repository_workflow_job.go index 718df2d..ec6afcd 100644 --- a/github/table_github_actions_repository_workflow_job.go +++ b/github/table_github_actions_repository_workflow_job.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_actions_repository_workflow_run.go b/github/table_github_actions_repository_workflow_run.go index d498739..398833e 100644 --- a/github/table_github_actions_repository_workflow_run.go +++ b/github/table_github_actions_repository_workflow_run.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_audit_log.go b/github/table_github_audit_log.go index 2519e7a..b8f74ed 100644 --- a/github/table_github_audit_log.go +++ b/github/table_github_audit_log.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" "github.com/turbot/steampipe-plugin-sdk/v6/plugin/transform" diff --git a/github/table_github_code_owner.go b/github/table_github_code_owner.go index b2bc801..532d450 100644 --- a/github/table_github_code_owner.go +++ b/github/table_github_code_owner.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/plugin/transform" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" diff --git a/github/table_github_gist.go b/github/table_github_gist.go index 640338b..3e4d392 100644 --- a/github/table_github_gist.go +++ b/github/table_github_gist.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_gitignore.go b/github/table_github_gitignore.go index e830ae1..9043e63 100644 --- a/github/table_github_gitignore.go +++ b/github/table_github_gitignore.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" @@ -39,7 +39,7 @@ func tableGitHubGitignoreList(ctx context.Context, d *plugin.QueryData, h *plugi for _, i := range gitIgnores { if i != "" { - d.StreamListItem(ctx, github.Gitignore{Name: github.String(i)}) + d.StreamListItem(ctx, github.Gitignore{Name: &i}) } // Context can be cancelled due to manual cancellation or the limit has been hit diff --git a/github/table_github_my_gist.go b/github/table_github_my_gist.go index ce9d986..f7e4233 100644 --- a/github/table_github_my_gist.go +++ b/github/table_github_my_gist.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" ) diff --git a/github/table_github_organization.go b/github/table_github_organization.go index 743ddd8..9f23872 100644 --- a/github/table_github_organization.go +++ b/github/table_github_organization.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/shurcooL/githubv4" "github.com/turbot/steampipe-plugin-github/github/models" diff --git a/github/table_github_organization_collaborators.go b/github/table_github_organization_collaborators.go index a11af48..b113476 100644 --- a/github/table_github_organization_collaborators.go +++ b/github/table_github_organization_collaborators.go @@ -81,7 +81,7 @@ func listGitHubOrganizationCollaborators(ctx context.Context, d *plugin.QueryDat } // We are encountering the secondary rate limit when making API calls with a page size of 100 for large-scale datasets. - // Reducing the page size to fetch smaller data amounts per page could be beneficial. + // Reducing the page size to fetch smaller data amounts per page could be beneficial. pageSize := adjustPageSize(50, d.QueryContext.Limit) var query struct { diff --git a/github/table_github_organization_dependabot_alert.go b/github/table_github_organization_dependabot_alert.go index 62cecff..eedd707 100644 --- a/github/table_github_organization_dependabot_alert.go +++ b/github/table_github_organization_dependabot_alert.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" "github.com/turbot/steampipe-plugin-sdk/v6/plugin/transform" diff --git a/github/table_github_package.go b/github/table_github_package.go index f35b1fb..6068778 100644 --- a/github/table_github_package.go +++ b/github/table_github_package.go @@ -4,7 +4,7 @@ import ( "context" "net/url" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_package_version.go b/github/table_github_package_version.go index db557d8..ba9f26f 100644 --- a/github/table_github_package_version.go +++ b/github/table_github_package_version.go @@ -5,7 +5,7 @@ import ( "net/url" "strings" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_rate_limit.go b/github/table_github_rate_limit.go index aecc6d5..880e257 100644 --- a/github/table_github_rate_limit.go +++ b/github/table_github_rate_limit.go @@ -30,7 +30,7 @@ func tableGitHubRateLimit() *plugin.Table { func listGitHubRateLimit(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { client := connect(ctx, d) - rateLimits, _, err := client.RateLimits(ctx) + rateLimits, _, err := client.RateLimit.Get(ctx) if err != nil { return nil, err } diff --git a/github/table_github_release.go b/github/table_github_release.go index e1ab9ec..e7852ca 100644 --- a/github/table_github_release.go +++ b/github/table_github_release.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_repository.go b/github/table_github_repository.go index 47cd262..daec44c 100644 --- a/github/table_github_repository.go +++ b/github/table_github_repository.go @@ -4,7 +4,7 @@ import ( "context" "strings" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/shurcooL/githubv4" "github.com/turbot/steampipe-plugin-github/github/models" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" diff --git a/github/table_github_repository_dependabot_alert.go b/github/table_github_repository_dependabot_alert.go index bcc5a9f..73bba88 100644 --- a/github/table_github_repository_dependabot_alert.go +++ b/github/table_github_repository_dependabot_alert.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" "github.com/turbot/steampipe-plugin-sdk/v6/plugin/transform" diff --git a/github/table_github_repository_sbom.go b/github/table_github_repository_sbom.go index dc71d16..8afa2ac 100644 --- a/github/table_github_repository_sbom.go +++ b/github/table_github_repository_sbom.go @@ -75,7 +75,7 @@ func tableGitHubRepositorySbom() *plugin.Table { } } -//// LIST FUNCTION +// LIST FUNCTION func listRepositorySboms(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData) (interface{}, error) { var owner, repo string @@ -95,4 +95,4 @@ func listRepositorySboms(ctx context.Context, d *plugin.QueryData, h *plugin.Hyd d.StreamListItem(ctx, sbom.SBOM) return sbom, nil -} \ No newline at end of file +} diff --git a/github/table_github_search_code.go b/github/table_github_search_code.go index e797429..0a50962 100644 --- a/github/table_github_search_code.go +++ b/github/table_github_search_code.go @@ -4,7 +4,7 @@ import ( "context" "regexp" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" "github.com/turbot/steampipe-plugin-sdk/v6/plugin/transform" diff --git a/github/table_github_search_commit.go b/github/table_github_search_commit.go index 1efa1af..8cb4896 100644 --- a/github/table_github_search_commit.go +++ b/github/table_github_search_commit.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" "github.com/turbot/steampipe-plugin-sdk/v6/plugin/transform" diff --git a/github/table_github_search_label.go b/github/table_github_search_label.go index d697b24..b62d427 100644 --- a/github/table_github_search_label.go +++ b/github/table_github_search_label.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" "github.com/turbot/steampipe-plugin-sdk/v6/plugin/transform" diff --git a/github/table_github_search_topic.go b/github/table_github_search_topic.go index 876b94a..ab7be6d 100644 --- a/github/table_github_search_topic.go +++ b/github/table_github_search_topic.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" "github.com/turbot/steampipe-plugin-sdk/v6/plugin/transform" diff --git a/github/table_github_traffic_clone_daily.go b/github/table_github_traffic_clone_daily.go index 1a6d58d..5af58f6 100644 --- a/github/table_github_traffic_clone_daily.go +++ b/github/table_github_traffic_clone_daily.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_traffic_clone_weekly.go b/github/table_github_traffic_clone_weekly.go index ad55eae..18c13d7 100644 --- a/github/table_github_traffic_clone_weekly.go +++ b/github/table_github_traffic_clone_weekly.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_traffic_view_daily.go b/github/table_github_traffic_view_daily.go index 6a78646..8905ed1 100644 --- a/github/table_github_traffic_view_daily.go +++ b/github/table_github_traffic_view_daily.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_traffic_view_weekly.go b/github/table_github_traffic_view_weekly.go index b24e454..a0f7355 100644 --- a/github/table_github_traffic_view_weekly.go +++ b/github/table_github_traffic_view_weekly.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_tree.go b/github/table_github_tree.go index 882fda7..924db8d 100644 --- a/github/table_github_tree.go +++ b/github/table_github_tree.go @@ -3,7 +3,7 @@ package github import ( "context" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/table_github_workflow.go b/github/table_github_workflow.go index f77a262..2ab48e1 100644 --- a/github/table_github_workflow.go +++ b/github/table_github_workflow.go @@ -9,7 +9,7 @@ import ( goPipeline "github.com/buildkite/go-pipeline" "github.com/ghodss/yaml" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/turbot/go-kit/types" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" "github.com/turbot/steampipe-plugin-sdk/v6/plugin" diff --git a/github/tag_utils.go b/github/tag_utils.go index 7b2903a..0e3a381 100644 --- a/github/tag_utils.go +++ b/github/tag_utils.go @@ -68,4 +68,4 @@ func tagHydrateCommit(_ context.Context, _ *plugin.QueryData, h *plugin.HydrateD return nil, err } return tag.Commit, nil -} \ No newline at end of file +} diff --git a/github/utils.go b/github/utils.go index f3ae19a..cae4ac6 100644 --- a/github/utils.go +++ b/github/utils.go @@ -14,7 +14,7 @@ import ( "github.com/turbot/steampipe-plugin-github/github/models" "github.com/turbot/steampipe-plugin-sdk/v6/grpc/proto" - "github.com/google/go-github/v55/github" + "github.com/google/go-github/v89/github" "github.com/shurcooL/githubv4" "golang.org/x/oauth2" @@ -115,14 +115,20 @@ func connect(ctx context.Context, d *plugin.QueryData) *github.Client { &oauth2.Token{AccessToken: token}, ) tc := oauth2.NewClient(ctx, ts) - client = github.NewClient(tc) + conn, err := github.NewClient(github.WithHTTPClient(tc)) + if err != nil { + panic(err) + } + client = conn } // Authentication Using App Installation Access Token or OAuth Access token if token != "" && isValidInstallationOrOAuthAccessTokenPrefix(token) { - client = github.NewClient(&http.Client{Transport: &oauth2Transport{ - Token: token, - }}) + conn, err := github.NewClient(github.WithAuthToken(token)) + if err != nil { + panic(err) + } + client = conn } // Authentication as Github APP Installation authentication @@ -140,7 +146,11 @@ func connect(ctx context.Context, d *plugin.QueryData) *github.Client { panic("Error occurred in 'connect()' during GitHub App Installation client creation: " + err.Error()) } - client = github.NewClient(&http.Client{Transport: itr}) + conn, err := github.NewClient(github.WithTransport(itr)) + if err != nil { + panic(err) + } + client = conn } // If the base URL was provided then set it on the client. Used for @@ -151,16 +161,10 @@ func connect(ctx context.Context, d *plugin.QueryData) *github.Client { panic(fmt.Sprintf("github.base_url is invalid: %s", baseURL)) } - if uv4.String() != "https://api.github.com/" { - uv4.Path = uv4.Path + "api/v3/" - } - - // The upload URL is not set as it's not currently required - conn, err := github.NewClient(client.Client()).WithEnterpriseURLs(uv4.String(), "") + conn, err := github.NewClient(github.WithEnterpriseURLs(uv4.String(), uv4.String())) if err != nil { panic(fmt.Sprintf("error creating GitHub client: %v", err)) } - conn.BaseURL = uv4 client = conn } diff --git a/go.mod b/go.mod index a7183e0..c7ec286 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/bradleyfalzon/ghinstallation v1.1.1 github.com/buildkite/go-pipeline v0.3.1 github.com/ghodss/yaml v1.0.0 - github.com/google/go-github/v55 v55.0.0 - github.com/shurcooL/githubv4 v0.0.0-20231126234147-1cffa1f02456 + github.com/google/go-github/v89 v89.0.0 + github.com/shurcooL/githubv4 v0.0.0-20260209031235-2402fdf4a9ed github.com/turbot/go-kit v1.1.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 golang.org/x/oauth2 v0.27.0 @@ -18,7 +18,6 @@ require ( cloud.google.com/go/compute/metadata v0.3.0 // indirect cloud.google.com/go/iam v1.1.6 // indirect cloud.google.com/go/storage v1.38.0 // indirect - github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/allegro/bigcache/v3 v3.1.0 // indirect @@ -30,7 +29,6 @@ require ( github.com/buildkite/interpolate v0.0.0-20200526001904-07f35b4ae251 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/cloudflare/circl v1.3.7 // indirect github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect github.com/dgraph-io/ristretto v0.2.0 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect @@ -47,9 +45,9 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/google/go-cmp v0.6.0 // indirect + github.com/google/go-cmp v0.7.0 // indirect github.com/google/go-github/v29 v29.0.2 // indirect - github.com/google/go-querystring v1.1.0 // indirect + github.com/google/go-querystring v1.2.0 // indirect github.com/google/s2a-go v0.1.7 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect diff --git a/go.sum b/go.sum index cd32926..746d8c6 100644 --- a/go.sum +++ b/go.sum @@ -607,8 +607,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 h1:wPbRQzjjwFc0ih8puEVAOFGELsn1zoIIYdxvML7mDxA= -github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8/go.mod h1:I0gYDMZ6Z5GRU7l58bNFSkPTFN6Yl12dsUlAZ8xy98g= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= @@ -652,7 +650,6 @@ github.com/buildkite/go-pipeline v0.3.1 h1:dWfpHVh2Z+BjHv0ZEgqqWmO7Qqcldh9J+f0DJ github.com/buildkite/go-pipeline v0.3.1/go.mod h1:iY5jzs3Afc8yHg6KDUcu3EJVkfaUkd9x/v/OH98qyUA= github.com/buildkite/interpolate v0.0.0-20200526001904-07f35b4ae251 h1:k6UDF1uPYOs0iy1HPeotNa155qXRWrzKnqAaGXHLZCE= github.com/buildkite/interpolate v0.0.0-20200526001904-07f35b4ae251/go.mod h1:gbPR1gPu9dB96mucYIR7T3B7p/78hRVSOuzIWLHK2Y4= -github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -669,9 +666,6 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I= -github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= -github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -826,15 +820,16 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/go-github/v29 v29.0.2 h1:opYN6Wc7DOz7Ku3Oh4l7prmkOMwEcQxpFtxdU8N8Pts= github.com/google/go-github/v29 v29.0.2/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E= -github.com/google/go-github/v55 v55.0.0 h1:4pp/1tNMB9X/LuAhs5i0KQAE40NmiR/y6prLNb9x9cg= -github.com/google/go-github/v55 v55.0.0/go.mod h1:JLahOTA1DnXzhxEymmFF5PP2tSS9JVNj68mSZNDwskA= +github.com/google/go-github/v89 v89.0.0 h1:35bEK5XoEcF3PZrlVbl9XN63f5BcJRA/UGkxeC9xPg0= +github.com/google/go-github/v89 v89.0.0/go.mod h1:QLcbU0ipeAqQuR5KSg8c2lql4Qk1EwJ2dWz/0rP4Nho= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= -github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/google/go-querystring v1.2.0 h1:yhqkPbu2/OH+V9BfpCVPZkNmUXhb2gBxJArfhIxNtP0= +github.com/google/go-querystring v1.2.0/go.mod h1:8IFJqpSRITyJ8QhQ13bmbeMBDfmeEJZD5A0egEOmkqU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -1051,8 +1046,8 @@ github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfF github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08Ocec= github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw= -github.com/shurcooL/githubv4 v0.0.0-20231126234147-1cffa1f02456 h1:6dExqsYngGEiixqa1vmtlUd+zbyISilg0Cf3GWVdeYM= -github.com/shurcooL/githubv4 v0.0.0-20231126234147-1cffa1f02456/go.mod h1:zqMwyHmnN/eDOZOdiTohqIUKUrTFX62PNlu7IJdu0q8= +github.com/shurcooL/githubv4 v0.0.0-20260209031235-2402fdf4a9ed h1:KT7hI8vYXgU0s2qaMkrfq9tCA1w/iEPgfredVP+4Tzw= +github.com/shurcooL/githubv4 v0.0.0-20260209031235-2402fdf4a9ed/go.mod h1:zqMwyHmnN/eDOZOdiTohqIUKUrTFX62PNlu7IJdu0q8= github.com/shurcooL/graphql v0.0.0-20220606043923-3cf50f8a0a29 h1:B1PEwpArrNp4dkQrfxh/abbBAOZBVp0ds+fBEOUOqOc= github.com/shurcooL/graphql v0.0.0-20220606043923-3cf50f8a0a29/go.mod h1:AuYgA5Kyo4c7HfUmvRGs/6rGlMMV/6B1bVnB9JxJEEg= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=