From d42160cab2d7e3f93ddc5bf09173236dc952f77c Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Tue, 17 Jun 2025 21:03:46 +0000 Subject: [PATCH] Update dependencies This change updates all dependencies. Signed-off-by: Gabriel Adrian Samfira --- go.mod | 32 +- go.sum | 66 ++- params/params.go | 2 +- runner/common/mocks/GithubClient.go | 2 +- runner/common/mocks/GithubEnterpriseClient.go | 2 +- runner/common/mocks/GithubEntityOperations.go | 2 +- runner/common/mocks/OrganizationHooks.go | 2 +- runner/common/mocks/RateLimitClient.go | 2 +- runner/common/mocks/RepositoryHooks.go | 2 +- runner/common/util.go | 2 +- runner/pool/common.go | 2 +- runner/pool/pool.go | 2 +- runner/pool/stub_client.go | 2 +- runner/pool/util.go | 2 +- test/integration/gh_cleanup/main.go | 2 +- test/integration/jobs_test.go | 2 +- test/integration/organizations_test.go | 2 +- test/integration/repositories_test.go | 2 +- util/github/client.go | 2 +- util/github/gitea.go | 2 +- util/github/scalesets/client.go | 2 +- .../ghinstallation/v2/transport.go | 2 +- vendor/github.com/go-logr/logr/.golangci.yaml | 16 +- vendor/github.com/go-logr/logr/funcr/funcr.go | 8 +- vendor/github.com/go-sql-driver/mysql/AUTHORS | 3 + .../go-sql-driver/mysql/CHANGELOG.md | 11 + .../github.com/go-sql-driver/mysql/buffer.go | 18 +- .../go-sql-driver/mysql/compress.go | 21 +- .../github.com/go-sql-driver/mysql/packets.go | 49 +- .../go-sql-driver/mysql/transaction.go | 18 +- .../v71/github/actions_required_workflows.go | 267 ----------- .../google/go-github/{v71 => v72}/AUTHORS | 0 .../google/go-github/{v71 => v72}/LICENSE | 0 .../go-github/{v71 => v72}/github/actions.go | 0 .../{v71 => v72}/github/actions_artifacts.go | 0 .../{v71 => v72}/github/actions_cache.go | 0 .../github/actions_hosted_runners.go | 0 .../{v71 => v72}/github/actions_oidc.go | 0 .../github/actions_permissions_enterprise.go | 0 .../github/actions_permissions_orgs.go | 0 .../github/actions_runner_groups.go | 0 .../{v71 => v72}/github/actions_runners.go | 0 .../{v71 => v72}/github/actions_secrets.go | 0 .../{v71 => v72}/github/actions_variables.go | 0 .../github/actions_workflow_jobs.go | 0 .../github/actions_workflow_runs.go | 0 .../{v71 => v72}/github/actions_workflows.go | 0 .../go-github/{v71 => v72}/github/activity.go | 0 .../{v71 => v72}/github/activity_events.go | 0 .../github/activity_notifications.go | 0 .../{v71 => v72}/github/activity_star.go | 0 .../{v71 => v72}/github/activity_watching.go | 0 .../go-github/{v71 => v72}/github/admin.go | 0 .../{v71 => v72}/github/admin_orgs.go | 0 .../{v71 => v72}/github/admin_stats.go | 0 .../{v71 => v72}/github/admin_users.go | 0 .../go-github/{v71 => v72}/github/apps.go | 0 .../{v71 => v72}/github/apps_hooks.go | 0 .../github/apps_hooks_deliveries.go | 0 .../{v71 => v72}/github/apps_installation.go | 0 .../{v71 => v72}/github/apps_manifest.go | 0 .../{v71 => v72}/github/apps_marketplace.go | 0 .../{v71 => v72}/github/attestations.go | 0 .../{v71 => v72}/github/authorizations.go | 0 .../go-github/{v71 => v72}/github/billing.go | 0 .../go-github/{v71 => v72}/github/checks.go | 0 .../{v71 => v72}/github/code_scanning.go | 0 .../{v71 => v72}/github/codesofconduct.go | 0 .../{v71 => v72}/github/codespaces.go | 0 .../{v71 => v72}/github/codespaces_secrets.go | 0 .../go-github/{v71 => v72}/github/copilot.go | 0 .../{v71 => v72}/github/dependabot.go | 0 .../{v71 => v72}/github/dependabot_alerts.go | 10 + .../{v71 => v72}/github/dependabot_secrets.go | 0 .../{v71 => v72}/github/dependency_graph.go | 0 .../github/dependency_graph_snapshots.go | 0 .../go-github/{v71 => v72}/github/doc.go | 2 +- .../go-github/{v71 => v72}/github/emojis.go | 0 .../{v71 => v72}/github/enterprise.go | 0 .../enterprise_actions_hosted_runners.go | 0 .../enterprise_actions_runner_groups.go | 0 .../github/enterprise_actions_runners.go | 0 .../github/enterprise_audit_log.go | 0 .../enterprise_code_security_and_analysis.go | 0 .../github/enterprise_manage_ghes.go | 0 .../github/enterprise_manage_ghes_config.go | 0 .../enterprise_manage_ghes_maintenance.go | 0 .../github/enterprise_manage_ghes_ssh.go | 0 .../enterprise_network_configurations.go | 0 .../github/enterprise_properties.go | 0 .../{v71 => v72}/github/enterprise_rules.go | 0 .../go-github/{v71 => v72}/github/event.go | 0 .../{v71 => v72}/github/event_types.go | 20 + .../go-github/{v71 => v72}/github/gists.go | 0 .../{v71 => v72}/github/gists_comments.go | 0 .../go-github/{v71 => v72}/github/git.go | 0 .../{v71 => v72}/github/git_blobs.go | 0 .../{v71 => v72}/github/git_commits.go | 0 .../go-github/{v71 => v72}/github/git_refs.go | 0 .../go-github/{v71 => v72}/github/git_tags.go | 0 .../{v71 => v72}/github/git_trees.go | 0 .../{v71 => v72}/github/github-accessors.go | 368 ++++++-------- .../go-github/{v71 => v72}/github/github.go | 2 +- .../{v71 => v72}/github/gitignore.go | 0 .../{v71 => v72}/github/interactions.go | 0 .../{v71 => v72}/github/interactions_orgs.go | 0 .../{v71 => v72}/github/interactions_repos.go | 0 .../{v71 => v72}/github/issue_import.go | 0 .../go-github/{v71 => v72}/github/issues.go | 9 + .../{v71 => v72}/github/issues_assignees.go | 0 .../{v71 => v72}/github/issues_comments.go | 0 .../{v71 => v72}/github/issues_events.go | 0 .../{v71 => v72}/github/issues_labels.go | 0 .../{v71 => v72}/github/issues_milestones.go | 0 .../{v71 => v72}/github/issues_timeline.go | 0 .../go-github/{v71 => v72}/github/licenses.go | 0 .../go-github/{v71 => v72}/github/markdown.go | 0 .../go-github/{v71 => v72}/github/messages.go | 1 + .../go-github/{v71 => v72}/github/meta.go | 0 .../{v71 => v72}/github/migrations.go | 0 .../github/migrations_source_import.go | 0 .../{v71 => v72}/github/migrations_user.go | 0 .../go-github/{v71 => v72}/github/orgs.go | 0 .../github/orgs_actions_allowed.go | 0 .../github/orgs_actions_permissions.go | 0 .../{v71 => v72}/github/orgs_attestations.go | 0 .../{v71 => v72}/github/orgs_audit_log.go | 0 .../orgs_codesecurity_configurations.go | 0 .../github/orgs_credential_authorizations.go | 0 .../github/orgs_custom_repository_roles.go | 0 .../{v71 => v72}/github/orgs_hooks.go | 0 .../github/orgs_hooks_configuration.go | 0 .../github/orgs_hooks_deliveries.go | 0 .../{v71 => v72}/github/orgs_issue_types.go | 0 .../{v71 => v72}/github/orgs_members.go | 0 .../github/orgs_network_configurations.go | 0 .../github/orgs_organization_roles.go | 0 .../github/orgs_outside_collaborators.go | 0 .../{v71 => v72}/github/orgs_packages.go | 0 .../github/orgs_personal_access_tokens.go | 0 .../{v71 => v72}/github/orgs_properties.go | 0 .../{v71 => v72}/github/orgs_rules.go | 7 +- .../github/orgs_security_managers.go | 0 .../github/orgs_users_blocking.go | 0 .../go-github/{v71 => v72}/github/packages.go | 0 .../go-github/{v71 => v72}/github/pulls.go | 0 .../{v71 => v72}/github/pulls_comments.go | 0 .../{v71 => v72}/github/pulls_reviewers.go | 0 .../{v71 => v72}/github/pulls_reviews.go | 0 .../{v71 => v72}/github/pulls_threads.go | 0 .../{v71 => v72}/github/rate_limit.go | 0 .../{v71 => v72}/github/reactions.go | 0 .../go-github/{v71 => v72}/github/repos.go | 0 .../github/repos_actions_access.go | 0 .../github/repos_actions_allowed.go | 0 .../github/repos_actions_permissions.go | 0 .../{v71 => v72}/github/repos_attestations.go | 0 .../{v71 => v72}/github/repos_autolinks.go | 0 .../{v71 => v72}/github/repos_codeowners.go | 0 .../github/repos_collaborators.go | 0 .../{v71 => v72}/github/repos_comments.go | 0 .../{v71 => v72}/github/repos_commits.go | 0 .../github/repos_community_health.go | 0 .../{v71 => v72}/github/repos_contents.go | 0 .../repos_deployment_branch_policies.go | 0 .../repos_deployment_protection_rules.go | 0 .../{v71 => v72}/github/repos_deployments.go | 0 .../{v71 => v72}/github/repos_environments.go | 0 .../{v71 => v72}/github/repos_forks.go | 0 .../{v71 => v72}/github/repos_hooks.go | 0 .../github/repos_hooks_configuration.go | 0 .../github/repos_hooks_deliveries.go | 21 + .../{v71 => v72}/github/repos_invitations.go | 0 .../{v71 => v72}/github/repos_keys.go | 0 .../{v71 => v72}/github/repos_lfs.go | 0 .../{v71 => v72}/github/repos_merging.go | 0 .../{v71 => v72}/github/repos_pages.go | 0 .../github/repos_prereceive_hooks.go | 0 .../{v71 => v72}/github/repos_properties.go | 0 .../{v71 => v72}/github/repos_releases.go | 0 .../{v71 => v72}/github/repos_rules.go | 27 +- .../{v71 => v72}/github/repos_stats.go | 0 .../{v71 => v72}/github/repos_statuses.go | 0 .../{v71 => v72}/github/repos_tags.go | 0 .../{v71 => v72}/github/repos_traffic.go | 0 .../go-github/{v71 => v72}/github/rules.go | 48 +- .../go-github/{v71 => v72}/github/scim.go | 0 .../go-github/{v71 => v72}/github/search.go | 0 .../{v71 => v72}/github/secret_scanning.go | 50 +- .../github/security_advisories.go | 0 .../go-github/{v71 => v72}/github/strings.go | 0 .../go-github/{v71 => v72}/github/teams.go | 0 .../github/teams_discussion_comments.go | 0 .../{v71 => v72}/github/teams_discussions.go | 0 .../{v71 => v72}/github/teams_members.go | 0 .../{v71 => v72}/github/timestamp.go | 0 .../go-github/{v71 => v72}/github/users.go | 0 .../github/users_administration.go | 0 .../{v71 => v72}/github/users_attestations.go | 0 .../{v71 => v72}/github/users_blocking.go | 0 .../{v71 => v72}/github/users_emails.go | 0 .../{v71 => v72}/github/users_followers.go | 0 .../{v71 => v72}/github/users_gpg_keys.go | 0 .../{v71 => v72}/github/users_keys.go | 0 .../{v71 => v72}/github/users_packages.go | 0 .../github/users_ssh_signing_keys.go | 0 .../{v71 => v72}/github/with_appengine.go | 0 .../{v71 => v72}/github/without_appengine.go | 0 .../prometheus/common/expfmt/text_parse.go | 4 +- .../prometheus/common/model/labels.go | 3 +- .../bson/bsonrw/extjson_writer.go | 7 +- vendor/go.opentelemetry.io/otel/.golangci.yml | 452 +++++++++--------- vendor/go.opentelemetry.io/otel/CHANGELOG.md | 54 ++- .../go.opentelemetry.io/otel/CONTRIBUTING.md | 1 + vendor/go.opentelemetry.io/otel/Makefile | 19 +- vendor/go.opentelemetry.io/otel/README.md | 8 +- vendor/go.opentelemetry.io/otel/RELEASING.md | 18 + .../otel/attribute/filter.go | 4 +- .../internal}/attribute.go | 2 +- .../otel/attribute/rawhelpers.go | 37 ++ .../otel/attribute/value.go | 15 +- .../otel/dependencies.Dockerfile | 5 +- .../go.opentelemetry.io/otel/get_main_pkgs.sh | 30 -- .../go.opentelemetry.io/otel/internal/gen.go | 18 - .../otel/internal/global/handler.go | 1 + .../otel/internal/global/meter.go | 45 +- .../otel/internal/global/trace.go | 13 +- .../otel/internal/rawhelpers.go | 48 -- .../otel/metric/asyncfloat64.go | 12 +- .../otel/metric/asyncint64.go | 8 +- .../otel/metric/instrument.go | 16 +- .../go.opentelemetry.io/otel/metric/meter.go | 10 +- .../otel/propagation/baggage.go | 36 +- .../otel/propagation/propagation.go | 30 +- vendor/go.opentelemetry.io/otel/renovate.json | 7 +- .../otel/semconv/internal/v2/http.go | 1 + vendor/go.opentelemetry.io/otel/trace/auto.go | 5 +- .../otel/trace/internal/telemetry/span.go | 56 ++- .../otel/trace/internal/telemetry/status.go | 12 +- .../otel/trace/internal/telemetry/traces.go | 4 +- .../otel/trace/internal/telemetry/value.go | 2 +- vendor/go.opentelemetry.io/otel/trace/noop.go | 2 + .../otel/verify_readmes.sh | 21 - vendor/go.opentelemetry.io/otel/version.go | 2 +- vendor/go.opentelemetry.io/otel/versions.yaml | 8 +- vendor/golang.org/x/crypto/bcrypt/bcrypt.go | 2 +- vendor/golang.org/x/mod/semver/semver.go | 30 +- vendor/golang.org/x/sync/errgroup/errgroup.go | 9 +- vendor/gorm.io/driver/mysql/migrator.go | 2 +- vendor/gorm.io/driver/mysql/mysql.go | 4 +- vendor/gorm.io/driver/sqlite/ddlmod.go | 10 +- vendor/gorm.io/driver/sqlite/sqlite.go | 4 +- vendor/modules.txt | 47 +- 253 files changed, 1092 insertions(+), 1146 deletions(-) delete mode 100644 vendor/github.com/google/go-github/v71/github/actions_required_workflows.go rename vendor/github.com/google/go-github/{v71 => v72}/AUTHORS (100%) rename vendor/github.com/google/go-github/{v71 => v72}/LICENSE (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_artifacts.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_cache.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_hosted_runners.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_oidc.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_permissions_enterprise.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_permissions_orgs.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_runner_groups.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_runners.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_secrets.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_variables.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_workflow_jobs.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_workflow_runs.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/actions_workflows.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/activity.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/activity_events.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/activity_notifications.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/activity_star.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/activity_watching.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/admin.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/admin_orgs.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/admin_stats.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/admin_users.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/apps.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/apps_hooks.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/apps_hooks_deliveries.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/apps_installation.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/apps_manifest.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/apps_marketplace.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/attestations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/authorizations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/billing.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/checks.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/code_scanning.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/codesofconduct.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/codespaces.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/codespaces_secrets.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/copilot.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/dependabot.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/dependabot_alerts.go (94%) rename vendor/github.com/google/go-github/{v71 => v72}/github/dependabot_secrets.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/dependency_graph.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/dependency_graph_snapshots.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/doc.go (99%) rename vendor/github.com/google/go-github/{v71 => v72}/github/emojis.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_actions_hosted_runners.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_actions_runner_groups.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_actions_runners.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_audit_log.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_code_security_and_analysis.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_manage_ghes.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_manage_ghes_config.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_manage_ghes_maintenance.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_manage_ghes_ssh.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_network_configurations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_properties.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/enterprise_rules.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/event.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/event_types.go (99%) rename vendor/github.com/google/go-github/{v71 => v72}/github/gists.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/gists_comments.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/git.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/git_blobs.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/git_commits.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/git_refs.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/git_tags.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/git_trees.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/github-accessors.go (99%) rename vendor/github.com/google/go-github/{v71 => v72}/github/github.go (99%) rename vendor/github.com/google/go-github/{v71 => v72}/github/gitignore.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/interactions.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/interactions_orgs.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/interactions_repos.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/issue_import.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/issues.go (97%) rename vendor/github.com/google/go-github/{v71 => v72}/github/issues_assignees.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/issues_comments.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/issues_events.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/issues_labels.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/issues_milestones.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/issues_timeline.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/licenses.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/markdown.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/messages.go (99%) rename vendor/github.com/google/go-github/{v71 => v72}/github/meta.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/migrations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/migrations_source_import.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/migrations_user.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_actions_allowed.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_actions_permissions.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_attestations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_audit_log.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_codesecurity_configurations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_credential_authorizations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_custom_repository_roles.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_hooks.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_hooks_configuration.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_hooks_deliveries.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_issue_types.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_members.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_network_configurations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_organization_roles.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_outside_collaborators.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_packages.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_personal_access_tokens.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_properties.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_rules.go (96%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_security_managers.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/orgs_users_blocking.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/packages.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/pulls.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/pulls_comments.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/pulls_reviewers.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/pulls_reviews.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/pulls_threads.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/rate_limit.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/reactions.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_actions_access.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_actions_allowed.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_actions_permissions.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_attestations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_autolinks.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_codeowners.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_collaborators.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_comments.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_commits.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_community_health.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_contents.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_deployment_branch_policies.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_deployment_protection_rules.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_deployments.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_environments.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_forks.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_hooks.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_hooks_configuration.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_hooks_deliveries.go (89%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_invitations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_keys.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_lfs.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_merging.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_pages.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_prereceive_hooks.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_properties.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_releases.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_rules.go (88%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_stats.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_statuses.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_tags.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/repos_traffic.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/rules.go (95%) rename vendor/github.com/google/go-github/{v71 => v72}/github/scim.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/search.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/secret_scanning.go (78%) rename vendor/github.com/google/go-github/{v71 => v72}/github/security_advisories.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/strings.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/teams.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/teams_discussion_comments.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/teams_discussions.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/teams_members.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/timestamp.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users_administration.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users_attestations.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users_blocking.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users_emails.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users_followers.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users_gpg_keys.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users_keys.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users_packages.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/users_ssh_signing_keys.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/with_appengine.go (100%) rename vendor/github.com/google/go-github/{v71 => v72}/github/without_appengine.go (100%) rename vendor/go.opentelemetry.io/otel/{internal/attribute => attribute/internal}/attribute.go (97%) create mode 100644 vendor/go.opentelemetry.io/otel/attribute/rawhelpers.go delete mode 100644 vendor/go.opentelemetry.io/otel/get_main_pkgs.sh delete mode 100644 vendor/go.opentelemetry.io/otel/internal/gen.go delete mode 100644 vendor/go.opentelemetry.io/otel/internal/rawhelpers.go delete mode 100644 vendor/go.opentelemetry.io/otel/verify_readmes.sh diff --git a/go.mod b/go.mod index 94071dd7..ad7cdb66 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.6 require ( github.com/BurntSushi/toml v1.5.0 - github.com/bradleyfalzon/ghinstallation/v2 v2.15.0 + github.com/bradleyfalzon/ghinstallation/v2 v2.16.0 github.com/cloudbase/garm-provider-common v0.1.5-0.20250417155201-8ef03502d06e github.com/felixge/httpsnoop v1.0.4 github.com/go-openapi/errors v0.22.1 @@ -14,7 +14,7 @@ require ( github.com/go-openapi/strfmt v0.23.0 github.com/go-openapi/swag v0.23.1 github.com/golang-jwt/jwt/v5 v5.2.2 - github.com/google/go-github/v71 v71.0.0 + github.com/google/go-github/v72 v72.0.0 github.com/google/uuid v1.6.0 github.com/gorilla/handlers v1.5.2 github.com/gorilla/mux v1.8.1 @@ -28,15 +28,15 @@ require ( github.com/prometheus/client_golang v1.22.0 github.com/spf13/cobra v1.9.1 github.com/stretchr/testify v1.10.0 - golang.org/x/crypto v0.38.0 - golang.org/x/mod v0.24.0 + golang.org/x/crypto v0.39.0 + golang.org/x/mod v0.25.0 golang.org/x/oauth2 v0.30.0 - golang.org/x/sync v0.14.0 + golang.org/x/sync v0.15.0 gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gorm.io/datatypes v1.2.5 - gorm.io/driver/mysql v1.5.7 - gorm.io/driver/sqlite v1.5.7 + gorm.io/driver/mysql v1.6.0 + gorm.io/driver/sqlite v1.6.0 gorm.io/gorm v1.30.0 ) @@ -47,7 +47,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chzyer/readline v1.5.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/analysis v0.23.0 // indirect github.com/go-openapi/jsonpointer v0.21.1 // indirect @@ -55,7 +55,7 @@ require ( github.com/go-openapi/loads v0.22.0 // indirect github.com/go-openapi/spec v0.21.0 // indirect github.com/go-openapi/validate v0.24.0 // indirect - github.com/go-sql-driver/mysql v1.9.2 // indirect + github.com/go-sql-driver/mysql v1.9.3 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -76,20 +76,20 @@ require ( github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.63.0 // indirect + github.com/prometheus/common v0.64.0 // indirect github.com/prometheus/procfs v0.16.1 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/spf13/pflag v1.0.6 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 // indirect - go.mongodb.org/mongo-driver v1.17.3 // indirect + go.mongodb.org/mongo-driver v1.17.4 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect - go.opentelemetry.io/otel v1.35.0 // indirect - go.opentelemetry.io/otel/metric v1.35.0 // indirect - go.opentelemetry.io/otel/trace v1.35.0 // indirect - golang.org/x/net v0.40.0 // indirect + go.opentelemetry.io/otel v1.36.0 // indirect + go.opentelemetry.io/otel/metric v1.36.0 // indirect + go.opentelemetry.io/otel/trace v1.36.0 // indirect + golang.org/x/net v0.41.0 // indirect golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.25.0 // indirect + golang.org/x/text v0.26.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 467ebbcf..99587a2c 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3d github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bradleyfalzon/ghinstallation/v2 v2.15.0 h1:7r2rPUM04rgszMP0U1UZ1M5VoVVIlsaBSnpABfYxcQY= -github.com/bradleyfalzon/ghinstallation/v2 v2.15.0/go.mod h1:PoH9Vhy82OeRFZfxsVrk3mfQhVkEzou9OOwPOsEhiXE= +github.com/bradleyfalzon/ghinstallation/v2 v2.16.0 h1:B91r9bHtXp/+XRgS5aZm6ZzTdz3ahgJYmkt4xZkgDz8= +github.com/bradleyfalzon/ghinstallation/v2 v2.16.0/go.mod h1:OeVe5ggFzoBnmgitZe/A+BqGOnv1DvU/0uiLQi1wutM= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -28,8 +28,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU= @@ -52,9 +52,8 @@ github.com/go-openapi/swag v0.23.1 h1:lpsStH0n2ittzTnbaSloVZLuB5+fvSY/+hnagBjSNZ github.com/go-openapi/swag v0.23.1/go.mod h1:STZs8TbRvEQQKUA+JZNAm3EWlgaOBGpyFDqQnDHMef0= github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58= github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ= -github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= -github.com/go-sql-driver/mysql v1.9.2 h1:4cNKDYQ1I84SXslGddlsrMhc8k4LeDVj6Ad6WRjiHuU= -github.com/go-sql-driver/mysql v1.9.2/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= +github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo= +github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= @@ -66,8 +65,8 @@ github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EO github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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/v71 v71.0.0 h1:Zi16OymGKZZMm8ZliffVVJ/Q9YZreDKONCr+WUd0Z30= -github.com/google/go-github/v71 v71.0.0/go.mod h1:URZXObp2BLlMjwu0O8g4y6VBneUj2bCHgnI8FfgZ51M= +github.com/google/go-github/v72 v72.0.0 h1:FcIO37BLoVPBO9igQQ6tStsv2asG4IPcYFi655PPvBM= +github.com/google/go-github/v72 v72.0.0/go.mod h1:WWtw8GMRiL62mvIquf1kO3onRHeWWKmK01qdCY8c5fg= 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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -153,8 +152,8 @@ github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/ github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= -github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k= -github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18= +github.com/prometheus/common v0.64.0 h1:pdZeA+g617P7oGv1CzdTzyeShxAGrTBsolKNOLQPGO4= +github.com/prometheus/common v0.64.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8= github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -176,35 +175,35 @@ github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOf github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 h1:xzABM9let0HLLqFypcxvLmlvEciCHL7+Lv+4vwZqecI= github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569/go.mod h1:2Ly+NIftZN4de9zRmENdYbvPQeaVIYKWpLFStLFEBgI= -go.mongodb.org/mongo-driver v1.17.3 h1:TQyXhnsWfWtgAhMtOgtYHMTkZIfBTpMTsMnd9ZBeHxQ= -go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= +go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw= +go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= -go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ= -go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= -go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M= -go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= +go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= +go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= +go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE= +go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs= go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw= go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg= -go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= -go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= -golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= -golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= -golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= -golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= -golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= -golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w= +go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA= +golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= +golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= +golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= +golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= -golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= -golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= +golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= @@ -222,14 +221,13 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/datatypes v1.2.5 h1:9UogU3jkydFVW1bIVVeoYsTpLRgwDVW3rHfJG6/Ek9I= gorm.io/datatypes v1.2.5/go.mod h1:I5FUdlKpLb5PMqeMQhm30CQ6jXP8Rj89xkTeCSAaAD4= -gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo= -gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM= +gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= +gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U= gorm.io/driver/postgres v1.5.0/go.mod h1:FUZXzO+5Uqg5zzwzv4KK49R8lvGIyscBOqYrtI1Ce9A= -gorm.io/driver/sqlite v1.5.7 h1:8NvsrhP0ifM7LX9G4zPB97NwovUakUxc+2V2uuf3Z1I= -gorm.io/driver/sqlite v1.5.7/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= gorm.io/driver/sqlserver v1.5.4 h1:xA+Y1KDNspv79q43bPyjDMUgHoYHLhXYmdFcYPobg8g= gorm.io/driver/sqlserver v1.5.4/go.mod h1:+frZ/qYmuna11zHPlh5oc2O6ZA/lS88Keb0XSH1Zh/g= -gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs= gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= diff --git a/params/params.go b/params/params.go index a680fda4..2a7fdef9 100644 --- a/params/params.go +++ b/params/params.go @@ -27,7 +27,7 @@ import ( "time" "github.com/bradleyfalzon/ghinstallation/v2" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" "github.com/google/uuid" "golang.org/x/oauth2" diff --git a/runner/common/mocks/GithubClient.go b/runner/common/mocks/GithubClient.go index 36ef1079..f44d54cb 100644 --- a/runner/common/mocks/GithubClient.go +++ b/runner/common/mocks/GithubClient.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - github "github.com/google/go-github/v71/github" + github "github.com/google/go-github/v72/github" mock "github.com/stretchr/testify/mock" params "github.com/cloudbase/garm/params" diff --git a/runner/common/mocks/GithubEnterpriseClient.go b/runner/common/mocks/GithubEnterpriseClient.go index fa2966f0..5606e340 100644 --- a/runner/common/mocks/GithubEnterpriseClient.go +++ b/runner/common/mocks/GithubEnterpriseClient.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - github "github.com/google/go-github/v71/github" + github "github.com/google/go-github/v72/github" mock "github.com/stretchr/testify/mock" ) diff --git a/runner/common/mocks/GithubEntityOperations.go b/runner/common/mocks/GithubEntityOperations.go index 0aab9943..15326795 100644 --- a/runner/common/mocks/GithubEntityOperations.go +++ b/runner/common/mocks/GithubEntityOperations.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - github "github.com/google/go-github/v71/github" + github "github.com/google/go-github/v72/github" mock "github.com/stretchr/testify/mock" params "github.com/cloudbase/garm/params" diff --git a/runner/common/mocks/OrganizationHooks.go b/runner/common/mocks/OrganizationHooks.go index 46638f02..73528638 100644 --- a/runner/common/mocks/OrganizationHooks.go +++ b/runner/common/mocks/OrganizationHooks.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - github "github.com/google/go-github/v71/github" + github "github.com/google/go-github/v72/github" mock "github.com/stretchr/testify/mock" ) diff --git a/runner/common/mocks/RateLimitClient.go b/runner/common/mocks/RateLimitClient.go index 2c360217..119f62e1 100644 --- a/runner/common/mocks/RateLimitClient.go +++ b/runner/common/mocks/RateLimitClient.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - github "github.com/google/go-github/v71/github" + github "github.com/google/go-github/v72/github" mock "github.com/stretchr/testify/mock" ) diff --git a/runner/common/mocks/RepositoryHooks.go b/runner/common/mocks/RepositoryHooks.go index 76ed0db0..3f38915e 100644 --- a/runner/common/mocks/RepositoryHooks.go +++ b/runner/common/mocks/RepositoryHooks.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - github "github.com/google/go-github/v71/github" + github "github.com/google/go-github/v72/github" mock "github.com/stretchr/testify/mock" ) diff --git a/runner/common/util.go b/runner/common/util.go index 2720c496..588ab68e 100644 --- a/runner/common/util.go +++ b/runner/common/util.go @@ -18,7 +18,7 @@ import ( "context" "net/url" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" "github.com/cloudbase/garm/params" ) diff --git a/runner/pool/common.go b/runner/pool/common.go index 5316e07e..066866a2 100644 --- a/runner/pool/common.go +++ b/runner/pool/common.go @@ -20,7 +20,7 @@ import ( "net/url" "strings" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" "github.com/pkg/errors" runnerErrors "github.com/cloudbase/garm-provider-common/errors" diff --git a/runner/pool/pool.go b/runner/pool/pool.go index ca95867f..17285e1d 100644 --- a/runner/pool/pool.go +++ b/runner/pool/pool.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" "github.com/google/uuid" "github.com/pkg/errors" "golang.org/x/sync/errgroup" diff --git a/runner/pool/stub_client.go b/runner/pool/stub_client.go index 6fa44e74..6493f7a5 100644 --- a/runner/pool/stub_client.go +++ b/runner/pool/stub_client.go @@ -18,7 +18,7 @@ import ( "context" "net/url" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" "github.com/cloudbase/garm/params" ) diff --git a/runner/pool/util.go b/runner/pool/util.go index dd55e1db..c6c311c8 100644 --- a/runner/pool/util.go +++ b/runner/pool/util.go @@ -21,7 +21,7 @@ import ( "sync/atomic" "time" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" runnerErrors "github.com/cloudbase/garm-provider-common/errors" commonParams "github.com/cloudbase/garm-provider-common/params" diff --git a/test/integration/gh_cleanup/main.go b/test/integration/gh_cleanup/main.go index 95f1aa78..86d39ea7 100644 --- a/test/integration/gh_cleanup/main.go +++ b/test/integration/gh_cleanup/main.go @@ -20,7 +20,7 @@ import ( "log/slog" "os" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" "golang.org/x/oauth2" ) diff --git a/test/integration/jobs_test.go b/test/integration/jobs_test.go index 8da94414..4b2d9d5d 100644 --- a/test/integration/jobs_test.go +++ b/test/integration/jobs_test.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" commonParams "github.com/cloudbase/garm-provider-common/params" "github.com/cloudbase/garm/params" diff --git a/test/integration/organizations_test.go b/test/integration/organizations_test.go index 8acfb6d3..d587f4a5 100644 --- a/test/integration/organizations_test.go +++ b/test/integration/organizations_test.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" commonParams "github.com/cloudbase/garm-provider-common/params" "github.com/cloudbase/garm/params" diff --git a/test/integration/repositories_test.go b/test/integration/repositories_test.go index 43a5d8ec..1b0558f9 100644 --- a/test/integration/repositories_test.go +++ b/test/integration/repositories_test.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" "golang.org/x/oauth2" commonParams "github.com/cloudbase/garm-provider-common/params" diff --git a/util/github/client.go b/util/github/client.go index 35d846ab..46b6a170 100644 --- a/util/github/client.go +++ b/util/github/client.go @@ -24,7 +24,7 @@ import ( "net/url" "strings" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" "github.com/pkg/errors" runnerErrors "github.com/cloudbase/garm-provider-common/errors" diff --git a/util/github/gitea.go b/util/github/gitea.go index e657db48..51f340b7 100644 --- a/util/github/gitea.go +++ b/util/github/gitea.go @@ -19,7 +19,7 @@ import ( "fmt" "net/http" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" "github.com/pkg/errors" "github.com/cloudbase/garm/metrics" diff --git a/util/github/scalesets/client.go b/util/github/scalesets/client.go index 7a8a53fd..5b01a539 100644 --- a/util/github/scalesets/client.go +++ b/util/github/scalesets/client.go @@ -20,7 +20,7 @@ import ( "net/http" "sync" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" runnerErrors "github.com/cloudbase/garm-provider-common/errors" "github.com/cloudbase/garm/params" diff --git a/vendor/github.com/bradleyfalzon/ghinstallation/v2/transport.go b/vendor/github.com/bradleyfalzon/ghinstallation/v2/transport.go index 39be5917..7794dd9b 100644 --- a/vendor/github.com/bradleyfalzon/ghinstallation/v2/transport.go +++ b/vendor/github.com/bradleyfalzon/ghinstallation/v2/transport.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/google/go-github/v71/github" + "github.com/google/go-github/v72/github" ) const ( diff --git a/vendor/github.com/go-logr/logr/.golangci.yaml b/vendor/github.com/go-logr/logr/.golangci.yaml index 0cffafa7..0ed62c1a 100644 --- a/vendor/github.com/go-logr/logr/.golangci.yaml +++ b/vendor/github.com/go-logr/logr/.golangci.yaml @@ -1,26 +1,28 @@ +version: "2" + run: timeout: 1m tests: true linters: - disable-all: true - enable: + default: none + enable: # please keep this alphabetized + - asasalint - asciicheck + - copyloopvar + - dupl - errcheck - forcetypeassert + - goconst - gocritic - - gofmt - - goimports - - gosimple - govet - ineffassign - misspell + - musttag - revive - staticcheck - - typecheck - unused issues: - exclude-use-default: false max-issues-per-linter: 0 max-same-issues: 10 diff --git a/vendor/github.com/go-logr/logr/funcr/funcr.go b/vendor/github.com/go-logr/logr/funcr/funcr.go index 30568e76..b22c57d7 100644 --- a/vendor/github.com/go-logr/logr/funcr/funcr.go +++ b/vendor/github.com/go-logr/logr/funcr/funcr.go @@ -77,7 +77,7 @@ func newSink(fn func(prefix, args string), formatter Formatter) logr.LogSink { write: fn, } // For skipping fnlogger.Info and fnlogger.Error. - l.Formatter.AddCallDepth(1) + l.AddCallDepth(1) // via Formatter return l } @@ -164,17 +164,17 @@ type fnlogger struct { } func (l fnlogger) WithName(name string) logr.LogSink { - l.Formatter.AddName(name) + l.AddName(name) // via Formatter return &l } func (l fnlogger) WithValues(kvList ...any) logr.LogSink { - l.Formatter.AddValues(kvList) + l.AddValues(kvList) // via Formatter return &l } func (l fnlogger) WithCallDepth(depth int) logr.LogSink { - l.Formatter.AddCallDepth(depth) + l.AddCallDepth(depth) // via Formatter return &l } diff --git a/vendor/github.com/go-sql-driver/mysql/AUTHORS b/vendor/github.com/go-sql-driver/mysql/AUTHORS index 510b869b..ec346e20 100644 --- a/vendor/github.com/go-sql-driver/mysql/AUTHORS +++ b/vendor/github.com/go-sql-driver/mysql/AUTHORS @@ -25,6 +25,7 @@ Asta Xie B Lamarche Bes Dollma Bogdan Constantinescu +Brad Higgins Brian Hendriks Bulat Gaifullin Caine Jette @@ -37,6 +38,7 @@ Daniel Montoya Daniel Nichter Daniël van Eeden Dave Protasowski +Diego Dupin Dirkjan Bussink DisposaBoy Egor Smolyakov @@ -133,6 +135,7 @@ Ziheng Lyu Barracuda Networks, Inc. Counting Ltd. +Defined Networking Inc. DigitalOcean Inc. Dolthub Inc. dyves labs AG diff --git a/vendor/github.com/go-sql-driver/mysql/CHANGELOG.md b/vendor/github.com/go-sql-driver/mysql/CHANGELOG.md index 66189eda..75674b60 100644 --- a/vendor/github.com/go-sql-driver/mysql/CHANGELOG.md +++ b/vendor/github.com/go-sql-driver/mysql/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## v1.9.3 (2025-06-13) + +* `tx.Commit()` and `tx.Rollback()` returned `ErrInvalidConn` always. + Now they return cached real error if present. (#1690) + +* Optimize reading small resultsets to fix performance regression + introduced by compression protocol support. (#1707) + +* Fix `db.Ping()` on compressed connection. (#1723) + + ## v1.9.2 (2025-04-07) v1.9.2 is a re-release of v1.9.1 due to a release process issue; no changes were made to the content. diff --git a/vendor/github.com/go-sql-driver/mysql/buffer.go b/vendor/github.com/go-sql-driver/mysql/buffer.go index a6532431..f895e87b 100644 --- a/vendor/github.com/go-sql-driver/mysql/buffer.go +++ b/vendor/github.com/go-sql-driver/mysql/buffer.go @@ -42,6 +42,11 @@ func (b *buffer) busy() bool { return len(b.buf) > 0 } +// len returns how many bytes in the read buffer. +func (b *buffer) len() int { + return len(b.buf) +} + // fill reads into the read buffer until at least _need_ bytes are in it. func (b *buffer) fill(need int, r readerFunc) error { // we'll move the contents of the current buffer to dest before filling it. @@ -86,17 +91,10 @@ func (b *buffer) fill(need int, r readerFunc) error { // returns next N bytes from buffer. // The returned slice is only guaranteed to be valid until the next read -func (b *buffer) readNext(need int, r readerFunc) ([]byte, error) { - if len(b.buf) < need { - // refill - if err := b.fill(need, r); err != nil { - return nil, err - } - } - - data := b.buf[:need] +func (b *buffer) readNext(need int) []byte { + data := b.buf[:need:need] b.buf = b.buf[need:] - return data, nil + return data } // takeBuffer returns a buffer with the requested size. diff --git a/vendor/github.com/go-sql-driver/mysql/compress.go b/vendor/github.com/go-sql-driver/mysql/compress.go index fa42772a..38bfa000 100644 --- a/vendor/github.com/go-sql-driver/mysql/compress.go +++ b/vendor/github.com/go-sql-driver/mysql/compress.go @@ -84,9 +84,9 @@ func (c *compIO) reset() { c.buff.Reset() } -func (c *compIO) readNext(need int, r readerFunc) ([]byte, error) { +func (c *compIO) readNext(need int) ([]byte, error) { for c.buff.Len() < need { - if err := c.readCompressedPacket(r); err != nil { + if err := c.readCompressedPacket(); err != nil { return nil, err } } @@ -94,8 +94,8 @@ func (c *compIO) readNext(need int, r readerFunc) ([]byte, error) { return data[:need:need], nil // prevent caller writes into c.buff } -func (c *compIO) readCompressedPacket(r readerFunc) error { - header, err := c.mc.buf.readNext(7, r) // size of compressed header +func (c *compIO) readCompressedPacket() error { + header, err := c.mc.readNext(7) if err != nil { return err } @@ -103,7 +103,7 @@ func (c *compIO) readCompressedPacket(r readerFunc) error { // compressed header structure comprLength := getUint24(header[0:3]) - compressionSequence := uint8(header[3]) + compressionSequence := header[3] uncompressedLength := getUint24(header[4:7]) if debug { fmt.Printf("uncompress cmplen=%v uncomplen=%v pkt_cmp_seq=%v expected_cmp_seq=%v\n", @@ -113,14 +113,13 @@ func (c *compIO) readCompressedPacket(r readerFunc) error { // Server may return error packet (e.g. 1153 Got a packet bigger than 'max_allowed_packet' bytes) // before receiving all packets from client. In this case, seqnr is younger than expected. // NOTE: Both of mariadbclient and mysqlclient do not check seqnr. Only server checks it. - if debug && compressionSequence != c.mc.sequence { + if debug && compressionSequence != c.mc.compressSequence { fmt.Printf("WARN: unexpected cmpress seq nr: expected %v, got %v", - c.mc.sequence, compressionSequence) + c.mc.compressSequence, compressionSequence) } - c.mc.sequence = compressionSequence + 1 - c.mc.compressSequence = c.mc.sequence + c.mc.compressSequence = compressionSequence + 1 - comprData, err := c.mc.buf.readNext(comprLength, r) + comprData, err := c.mc.readNext(comprLength) if err != nil { return err } @@ -200,7 +199,7 @@ func (c *compIO) writeCompressedPacket(data []byte, uncompressedLen int) (int, e comprLength := len(data) - 7 if debug { fmt.Printf( - "writeCompressedPacket: comprLength=%v, uncompressedLen=%v, seq=%v", + "writeCompressedPacket: comprLength=%v, uncompressedLen=%v, seq=%v\n", comprLength, uncompressedLen, mc.compressSequence) } diff --git a/vendor/github.com/go-sql-driver/mysql/packets.go b/vendor/github.com/go-sql-driver/mysql/packets.go index 4b836216..831fca6c 100644 --- a/vendor/github.com/go-sql-driver/mysql/packets.go +++ b/vendor/github.com/go-sql-driver/mysql/packets.go @@ -17,6 +17,7 @@ import ( "fmt" "io" "math" + "os" "strconv" "time" ) @@ -25,19 +26,30 @@ import ( // https://dev.mysql.com/doc/dev/mysql-server/latest/PAGE_PROTOCOL.html // https://mariadb.com/kb/en/clientserver-protocol/ +// read n bytes from mc.buf +func (mc *mysqlConn) readNext(n int) ([]byte, error) { + if mc.buf.len() < n { + err := mc.buf.fill(n, mc.readWithTimeout) + if err != nil { + return nil, err + } + } + return mc.buf.readNext(n), nil +} + // Read packet to buffer 'data' func (mc *mysqlConn) readPacket() ([]byte, error) { var prevData []byte invalidSequence := false - readNext := mc.buf.readNext + readNext := mc.readNext if mc.compress { readNext = mc.compIO.readNext } for { // read packet header - data, err := readNext(4, mc.readWithTimeout) + data, err := readNext(4) if err != nil { mc.close() if cerr := mc.canceled.Value(); cerr != nil { @@ -51,17 +63,11 @@ func (mc *mysqlConn) readPacket() ([]byte, error) { pktLen := getUint24(data[:3]) seq := data[3] - if mc.compress { + // check packet sync [8 bit] + if seq != mc.sequence { + mc.log(fmt.Sprintf("[warn] unexpected sequence nr: expected %v, got %v", mc.sequence, seq)) // MySQL and MariaDB doesn't check packet nr in compressed packet. - if debug && seq != mc.compressSequence { - fmt.Printf("[debug] mismatched compression sequence nr: expected: %v, got %v", - mc.compressSequence, seq) - } - mc.compressSequence = seq + 1 - } else { - // check packet sync [8 bit] - if seq != mc.sequence { - mc.log(fmt.Sprintf("[warn] unexpected seq nr: expected %v, got %v", mc.sequence, seq)) + if !mc.compress { // For large packets, we stop reading as soon as sync error. if len(prevData) > 0 { mc.close() @@ -69,8 +75,8 @@ func (mc *mysqlConn) readPacket() ([]byte, error) { } invalidSequence = true } - mc.sequence++ } + mc.sequence = seq + 1 // packets with length 0 terminate a previous packet which is a // multiple of (2^24)-1 bytes long @@ -85,7 +91,7 @@ func (mc *mysqlConn) readPacket() ([]byte, error) { } // read packet body [pktLen bytes] - data, err = readNext(pktLen, mc.readWithTimeout) + data, err = readNext(pktLen) if err != nil { mc.close() if cerr := mc.canceled.Value(); cerr != nil { @@ -135,7 +141,7 @@ func (mc *mysqlConn) writePacket(data []byte) error { // Write packet if debug { - fmt.Printf("writePacket: size=%v seq=%v", size, mc.sequence) + fmt.Fprintf(os.Stderr, "writePacket: size=%v seq=%v\n", size, mc.sequence) } n, err := writeFunc(data[:4+size]) @@ -434,7 +440,9 @@ func (mc *mysqlConn) writeCommandPacket(command byte) error { data[4] = command // Send CMD packet - return mc.writePacket(data) + err = mc.writePacket(data) + mc.syncSequence() + return err } func (mc *mysqlConn) writeCommandPacketStr(command byte, arg string) error { @@ -475,7 +483,9 @@ func (mc *mysqlConn) writeCommandPacketUint32(command byte, arg uint32) error { binary.LittleEndian.PutUint32(data[5:], arg) // Send CMD packet - return mc.writePacket(data) + err = mc.writePacket(data) + mc.syncSequence() + return err } /****************************************************************************** @@ -945,7 +955,6 @@ func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error { pktLen = dataOffset + argLen } - stmt.mc.resetSequence() // Add command byte [1 byte] data[4] = comStmtSendLongData @@ -957,6 +966,8 @@ func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error { // Send CMD packet err := stmt.mc.writePacket(data[:4+pktLen]) + // Every COM_LONG_DATA packet reset Packet Sequence + stmt.mc.resetSequence() if err == nil { data = data[pktLen-dataOffset:] continue @@ -964,8 +975,6 @@ func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error { return err } - // Reset Packet Sequence - stmt.mc.resetSequence() return nil } diff --git a/vendor/github.com/go-sql-driver/mysql/transaction.go b/vendor/github.com/go-sql-driver/mysql/transaction.go index 4a4b6100..8c502f49 100644 --- a/vendor/github.com/go-sql-driver/mysql/transaction.go +++ b/vendor/github.com/go-sql-driver/mysql/transaction.go @@ -13,18 +13,32 @@ type mysqlTx struct { } func (tx *mysqlTx) Commit() (err error) { - if tx.mc == nil || tx.mc.closed.Load() { + if tx.mc == nil { return ErrInvalidConn } + if tx.mc.closed.Load() { + err = tx.mc.error() + if err == nil { + err = ErrInvalidConn + } + return + } err = tx.mc.exec("COMMIT") tx.mc = nil return } func (tx *mysqlTx) Rollback() (err error) { - if tx.mc == nil || tx.mc.closed.Load() { + if tx.mc == nil { return ErrInvalidConn } + if tx.mc.closed.Load() { + err = tx.mc.error() + if err == nil { + err = ErrInvalidConn + } + return + } err = tx.mc.exec("ROLLBACK") tx.mc = nil return diff --git a/vendor/github.com/google/go-github/v71/github/actions_required_workflows.go b/vendor/github.com/google/go-github/v71/github/actions_required_workflows.go deleted file mode 100644 index b89741a8..00000000 --- a/vendor/github.com/google/go-github/v71/github/actions_required_workflows.go +++ /dev/null @@ -1,267 +0,0 @@ -// Copyright 2023 The go-github AUTHORS. All rights reserved. -// -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package github - -import ( - "context" - "fmt" -) - -// OrgRequiredWorkflow represents a required workflow object at the org level. -type OrgRequiredWorkflow struct { - ID *int64 `json:"id,omitempty"` - Name *string `json:"name,omitempty"` - Path *string `json:"path,omitempty"` - Scope *string `json:"scope,omitempty"` - Ref *string `json:"ref,omitempty"` - State *string `json:"state,omitempty"` - SelectedRepositoriesURL *string `json:"selected_repositories_url,omitempty"` - CreatedAt *Timestamp `json:"created_at,omitempty"` - UpdatedAt *Timestamp `json:"updated_at,omitempty"` - Repository *Repository `json:"repository,omitempty"` -} - -// OrgRequiredWorkflows represents the required workflows for the org. -type OrgRequiredWorkflows struct { - TotalCount *int `json:"total_count,omitempty"` - RequiredWorkflows []*OrgRequiredWorkflow `json:"required_workflows,omitempty"` -} - -// CreateUpdateRequiredWorkflowOptions represents the input object used to create or update required workflows. -type CreateUpdateRequiredWorkflowOptions struct { - WorkflowFilePath *string `json:"workflow_file_path,omitempty"` - RepositoryID *int64 `json:"repository_id,omitempty"` - Scope *string `json:"scope,omitempty"` - SelectedRepositoryIDs *SelectedRepoIDs `json:"selected_repository_ids,omitempty"` -} - -// RequiredWorkflowSelectedRepos represents the repos that a required workflow is applied to. -type RequiredWorkflowSelectedRepos struct { - TotalCount *int `json:"total_count,omitempty"` - Repositories []*Repository `json:"repositories,omitempty"` -} - -// RepoRequiredWorkflow represents a required workflow object at the repo level. -type RepoRequiredWorkflow struct { - ID *int64 `json:"id,omitempty"` - NodeID *string `json:"node_id,omitempty"` - Name *string `json:"name,omitempty"` - Path *string `json:"path,omitempty"` - State *string `json:"state,omitempty"` - URL *string `json:"url,omitempty"` - HTMLURL *string `json:"html_url,omitempty"` - BadgeURL *string `json:"badge_url,omitempty"` - CreatedAt *Timestamp `json:"created_at,omitempty"` - UpdatedAt *Timestamp `json:"updated_at,omitempty"` - SourceRepository *Repository `json:"source_repository,omitempty"` -} - -// RepoRequiredWorkflows represents the required workflows for a repo. -type RepoRequiredWorkflows struct { - TotalCount *int `json:"total_count,omitempty"` - RequiredWorkflows []*RepoRequiredWorkflow `json:"required_workflows,omitempty"` -} - -// ListOrgRequiredWorkflows lists the RequiredWorkflows for an org. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation GET /orgs/{org}/actions/required_workflows -func (s *ActionsService) ListOrgRequiredWorkflows(ctx context.Context, org string, opts *ListOptions) (*OrgRequiredWorkflows, *Response, error) { - url := fmt.Sprintf("orgs/%v/actions/required_workflows", org) - u, err := addOptions(url, opts) - if err != nil { - return nil, nil, err - } - - req, err := s.client.NewRequest("GET", u, nil) - if err != nil { - return nil, nil, err - } - - requiredWorkflows := new(OrgRequiredWorkflows) - resp, err := s.client.Do(ctx, req, &requiredWorkflows) - if err != nil { - return nil, resp, err - } - - return requiredWorkflows, resp, nil -} - -// CreateRequiredWorkflow creates the required workflow in an org. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation POST /orgs/{org}/actions/required_workflows -func (s *ActionsService) CreateRequiredWorkflow(ctx context.Context, org string, createRequiredWorkflowOptions *CreateUpdateRequiredWorkflowOptions) (*OrgRequiredWorkflow, *Response, error) { - url := fmt.Sprintf("orgs/%v/actions/required_workflows", org) - req, err := s.client.NewRequest("POST", url, createRequiredWorkflowOptions) - if err != nil { - return nil, nil, err - } - - orgRequiredWorkflow := new(OrgRequiredWorkflow) - resp, err := s.client.Do(ctx, req, orgRequiredWorkflow) - if err != nil { - return nil, resp, err - } - - return orgRequiredWorkflow, resp, nil -} - -// GetRequiredWorkflowByID get the RequiredWorkflows for an org by its ID. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation GET /orgs/{org}/actions/required_workflows/{workflow_id} -func (s *ActionsService) GetRequiredWorkflowByID(ctx context.Context, owner string, requiredWorkflowID int64) (*OrgRequiredWorkflow, *Response, error) { - u := fmt.Sprintf("orgs/%v/actions/required_workflows/%v", owner, requiredWorkflowID) - - req, err := s.client.NewRequest("GET", u, nil) - if err != nil { - return nil, nil, err - } - - requiredWorkflow := new(OrgRequiredWorkflow) - resp, err := s.client.Do(ctx, req, &requiredWorkflow) - if err != nil { - return nil, resp, err - } - - return requiredWorkflow, resp, nil -} - -// UpdateRequiredWorkflow updates a required workflow in an org. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation PATCH /orgs/{org}/actions/required_workflows/{workflow_id} -func (s *ActionsService) UpdateRequiredWorkflow(ctx context.Context, org string, requiredWorkflowID int64, updateRequiredWorkflowOptions *CreateUpdateRequiredWorkflowOptions) (*OrgRequiredWorkflow, *Response, error) { - url := fmt.Sprintf("orgs/%v/actions/required_workflows/%v", org, requiredWorkflowID) - req, err := s.client.NewRequest("PATCH", url, updateRequiredWorkflowOptions) - if err != nil { - return nil, nil, err - } - - orgRequiredWorkflow := new(OrgRequiredWorkflow) - resp, err := s.client.Do(ctx, req, orgRequiredWorkflow) - if err != nil { - return nil, resp, err - } - - return orgRequiredWorkflow, resp, nil -} - -// DeleteRequiredWorkflow deletes a required workflow in an org. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation DELETE /orgs/{org}/actions/required_workflows/{workflow_id} -func (s *ActionsService) DeleteRequiredWorkflow(ctx context.Context, org string, requiredWorkflowID int64) (*Response, error) { - url := fmt.Sprintf("orgs/%v/actions/required_workflows/%v", org, requiredWorkflowID) - req, err := s.client.NewRequest("DELETE", url, nil) - if err != nil { - return nil, err - } - return s.client.Do(ctx, req, nil) -} - -// ListRequiredWorkflowSelectedRepos lists the Repositories selected for a workflow. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation GET /orgs/{org}/actions/required_workflows/{workflow_id}/repositories -func (s *ActionsService) ListRequiredWorkflowSelectedRepos(ctx context.Context, org string, requiredWorkflowID int64, opts *ListOptions) (*RequiredWorkflowSelectedRepos, *Response, error) { - url := fmt.Sprintf("orgs/%v/actions/required_workflows/%v/repositories", org, requiredWorkflowID) - u, err := addOptions(url, opts) - if err != nil { - return nil, nil, err - } - req, err := s.client.NewRequest("GET", u, nil) - if err != nil { - return nil, nil, err - } - - requiredWorkflowRepos := new(RequiredWorkflowSelectedRepos) - resp, err := s.client.Do(ctx, req, &requiredWorkflowRepos) - if err != nil { - return nil, resp, err - } - - return requiredWorkflowRepos, resp, nil -} - -// SetRequiredWorkflowSelectedRepos sets the Repositories selected for a workflow. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation PUT /orgs/{org}/actions/required_workflows/{workflow_id}/repositories -func (s *ActionsService) SetRequiredWorkflowSelectedRepos(ctx context.Context, org string, requiredWorkflowID int64, ids SelectedRepoIDs) (*Response, error) { - type repoIDs struct { - SelectedIDs SelectedRepoIDs `json:"selected_repository_ids"` - } - url := fmt.Sprintf("orgs/%v/actions/required_workflows/%v/repositories", org, requiredWorkflowID) - req, err := s.client.NewRequest("PUT", url, repoIDs{SelectedIDs: ids}) - if err != nil { - return nil, err - } - - return s.client.Do(ctx, req, nil) -} - -// AddRepoToRequiredWorkflow adds the Repository to a required workflow. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation PUT /orgs/{org}/actions/required_workflows/{workflow_id}/repositories/{repository_id} -func (s *ActionsService) AddRepoToRequiredWorkflow(ctx context.Context, org string, requiredWorkflowID, repoID int64) (*Response, error) { - url := fmt.Sprintf("orgs/%v/actions/required_workflows/%v/repositories/%v", org, requiredWorkflowID, repoID) - req, err := s.client.NewRequest("PUT", url, nil) - if err != nil { - return nil, err - } - return s.client.Do(ctx, req, nil) -} - -// RemoveRepoFromRequiredWorkflow removes the Repository from a required workflow. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation DELETE /orgs/{org}/actions/required_workflows/{workflow_id}/repositories/{repository_id} -func (s *ActionsService) RemoveRepoFromRequiredWorkflow(ctx context.Context, org string, requiredWorkflowID, repoID int64) (*Response, error) { - url := fmt.Sprintf("orgs/%v/actions/required_workflows/%v/repositories/%v", org, requiredWorkflowID, repoID) - req, err := s.client.NewRequest("DELETE", url, nil) - if err != nil { - return nil, err - } - return s.client.Do(ctx, req, nil) -} - -// ListRepoRequiredWorkflows lists the RequiredWorkflows for a repo. -// -// GitHub API docs: https://docs.github.com/actions/using-workflows/required-workflows -// -//meta:operation GET /repos/{owner}/{repo}/actions/required_workflows -func (s *ActionsService) ListRepoRequiredWorkflows(ctx context.Context, owner, repo string, opts *ListOptions) (*RepoRequiredWorkflows, *Response, error) { - url := fmt.Sprintf("repos/%v/%v/actions/required_workflows", owner, repo) - u, err := addOptions(url, opts) - if err != nil { - return nil, nil, err - } - - req, err := s.client.NewRequest("GET", u, nil) - if err != nil { - return nil, nil, err - } - - requiredWorkflows := new(RepoRequiredWorkflows) - resp, err := s.client.Do(ctx, req, &requiredWorkflows) - if err != nil { - return nil, resp, err - } - - return requiredWorkflows, resp, nil -} diff --git a/vendor/github.com/google/go-github/v71/AUTHORS b/vendor/github.com/google/go-github/v72/AUTHORS similarity index 100% rename from vendor/github.com/google/go-github/v71/AUTHORS rename to vendor/github.com/google/go-github/v72/AUTHORS diff --git a/vendor/github.com/google/go-github/v71/LICENSE b/vendor/github.com/google/go-github/v72/LICENSE similarity index 100% rename from vendor/github.com/google/go-github/v71/LICENSE rename to vendor/github.com/google/go-github/v72/LICENSE diff --git a/vendor/github.com/google/go-github/v71/github/actions.go b/vendor/github.com/google/go-github/v72/github/actions.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions.go rename to vendor/github.com/google/go-github/v72/github/actions.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_artifacts.go b/vendor/github.com/google/go-github/v72/github/actions_artifacts.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_artifacts.go rename to vendor/github.com/google/go-github/v72/github/actions_artifacts.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_cache.go b/vendor/github.com/google/go-github/v72/github/actions_cache.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_cache.go rename to vendor/github.com/google/go-github/v72/github/actions_cache.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_hosted_runners.go b/vendor/github.com/google/go-github/v72/github/actions_hosted_runners.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_hosted_runners.go rename to vendor/github.com/google/go-github/v72/github/actions_hosted_runners.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_oidc.go b/vendor/github.com/google/go-github/v72/github/actions_oidc.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_oidc.go rename to vendor/github.com/google/go-github/v72/github/actions_oidc.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_permissions_enterprise.go b/vendor/github.com/google/go-github/v72/github/actions_permissions_enterprise.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_permissions_enterprise.go rename to vendor/github.com/google/go-github/v72/github/actions_permissions_enterprise.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_permissions_orgs.go b/vendor/github.com/google/go-github/v72/github/actions_permissions_orgs.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_permissions_orgs.go rename to vendor/github.com/google/go-github/v72/github/actions_permissions_orgs.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_runner_groups.go b/vendor/github.com/google/go-github/v72/github/actions_runner_groups.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_runner_groups.go rename to vendor/github.com/google/go-github/v72/github/actions_runner_groups.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_runners.go b/vendor/github.com/google/go-github/v72/github/actions_runners.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_runners.go rename to vendor/github.com/google/go-github/v72/github/actions_runners.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_secrets.go b/vendor/github.com/google/go-github/v72/github/actions_secrets.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_secrets.go rename to vendor/github.com/google/go-github/v72/github/actions_secrets.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_variables.go b/vendor/github.com/google/go-github/v72/github/actions_variables.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_variables.go rename to vendor/github.com/google/go-github/v72/github/actions_variables.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_workflow_jobs.go b/vendor/github.com/google/go-github/v72/github/actions_workflow_jobs.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_workflow_jobs.go rename to vendor/github.com/google/go-github/v72/github/actions_workflow_jobs.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_workflow_runs.go b/vendor/github.com/google/go-github/v72/github/actions_workflow_runs.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_workflow_runs.go rename to vendor/github.com/google/go-github/v72/github/actions_workflow_runs.go diff --git a/vendor/github.com/google/go-github/v71/github/actions_workflows.go b/vendor/github.com/google/go-github/v72/github/actions_workflows.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/actions_workflows.go rename to vendor/github.com/google/go-github/v72/github/actions_workflows.go diff --git a/vendor/github.com/google/go-github/v71/github/activity.go b/vendor/github.com/google/go-github/v72/github/activity.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/activity.go rename to vendor/github.com/google/go-github/v72/github/activity.go diff --git a/vendor/github.com/google/go-github/v71/github/activity_events.go b/vendor/github.com/google/go-github/v72/github/activity_events.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/activity_events.go rename to vendor/github.com/google/go-github/v72/github/activity_events.go diff --git a/vendor/github.com/google/go-github/v71/github/activity_notifications.go b/vendor/github.com/google/go-github/v72/github/activity_notifications.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/activity_notifications.go rename to vendor/github.com/google/go-github/v72/github/activity_notifications.go diff --git a/vendor/github.com/google/go-github/v71/github/activity_star.go b/vendor/github.com/google/go-github/v72/github/activity_star.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/activity_star.go rename to vendor/github.com/google/go-github/v72/github/activity_star.go diff --git a/vendor/github.com/google/go-github/v71/github/activity_watching.go b/vendor/github.com/google/go-github/v72/github/activity_watching.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/activity_watching.go rename to vendor/github.com/google/go-github/v72/github/activity_watching.go diff --git a/vendor/github.com/google/go-github/v71/github/admin.go b/vendor/github.com/google/go-github/v72/github/admin.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/admin.go rename to vendor/github.com/google/go-github/v72/github/admin.go diff --git a/vendor/github.com/google/go-github/v71/github/admin_orgs.go b/vendor/github.com/google/go-github/v72/github/admin_orgs.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/admin_orgs.go rename to vendor/github.com/google/go-github/v72/github/admin_orgs.go diff --git a/vendor/github.com/google/go-github/v71/github/admin_stats.go b/vendor/github.com/google/go-github/v72/github/admin_stats.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/admin_stats.go rename to vendor/github.com/google/go-github/v72/github/admin_stats.go diff --git a/vendor/github.com/google/go-github/v71/github/admin_users.go b/vendor/github.com/google/go-github/v72/github/admin_users.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/admin_users.go rename to vendor/github.com/google/go-github/v72/github/admin_users.go diff --git a/vendor/github.com/google/go-github/v71/github/apps.go b/vendor/github.com/google/go-github/v72/github/apps.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/apps.go rename to vendor/github.com/google/go-github/v72/github/apps.go diff --git a/vendor/github.com/google/go-github/v71/github/apps_hooks.go b/vendor/github.com/google/go-github/v72/github/apps_hooks.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/apps_hooks.go rename to vendor/github.com/google/go-github/v72/github/apps_hooks.go diff --git a/vendor/github.com/google/go-github/v71/github/apps_hooks_deliveries.go b/vendor/github.com/google/go-github/v72/github/apps_hooks_deliveries.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/apps_hooks_deliveries.go rename to vendor/github.com/google/go-github/v72/github/apps_hooks_deliveries.go diff --git a/vendor/github.com/google/go-github/v71/github/apps_installation.go b/vendor/github.com/google/go-github/v72/github/apps_installation.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/apps_installation.go rename to vendor/github.com/google/go-github/v72/github/apps_installation.go diff --git a/vendor/github.com/google/go-github/v71/github/apps_manifest.go b/vendor/github.com/google/go-github/v72/github/apps_manifest.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/apps_manifest.go rename to vendor/github.com/google/go-github/v72/github/apps_manifest.go diff --git a/vendor/github.com/google/go-github/v71/github/apps_marketplace.go b/vendor/github.com/google/go-github/v72/github/apps_marketplace.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/apps_marketplace.go rename to vendor/github.com/google/go-github/v72/github/apps_marketplace.go diff --git a/vendor/github.com/google/go-github/v71/github/attestations.go b/vendor/github.com/google/go-github/v72/github/attestations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/attestations.go rename to vendor/github.com/google/go-github/v72/github/attestations.go diff --git a/vendor/github.com/google/go-github/v71/github/authorizations.go b/vendor/github.com/google/go-github/v72/github/authorizations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/authorizations.go rename to vendor/github.com/google/go-github/v72/github/authorizations.go diff --git a/vendor/github.com/google/go-github/v71/github/billing.go b/vendor/github.com/google/go-github/v72/github/billing.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/billing.go rename to vendor/github.com/google/go-github/v72/github/billing.go diff --git a/vendor/github.com/google/go-github/v71/github/checks.go b/vendor/github.com/google/go-github/v72/github/checks.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/checks.go rename to vendor/github.com/google/go-github/v72/github/checks.go diff --git a/vendor/github.com/google/go-github/v71/github/code_scanning.go b/vendor/github.com/google/go-github/v72/github/code_scanning.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/code_scanning.go rename to vendor/github.com/google/go-github/v72/github/code_scanning.go diff --git a/vendor/github.com/google/go-github/v71/github/codesofconduct.go b/vendor/github.com/google/go-github/v72/github/codesofconduct.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/codesofconduct.go rename to vendor/github.com/google/go-github/v72/github/codesofconduct.go diff --git a/vendor/github.com/google/go-github/v71/github/codespaces.go b/vendor/github.com/google/go-github/v72/github/codespaces.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/codespaces.go rename to vendor/github.com/google/go-github/v72/github/codespaces.go diff --git a/vendor/github.com/google/go-github/v71/github/codespaces_secrets.go b/vendor/github.com/google/go-github/v72/github/codespaces_secrets.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/codespaces_secrets.go rename to vendor/github.com/google/go-github/v72/github/codespaces_secrets.go diff --git a/vendor/github.com/google/go-github/v71/github/copilot.go b/vendor/github.com/google/go-github/v72/github/copilot.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/copilot.go rename to vendor/github.com/google/go-github/v72/github/copilot.go diff --git a/vendor/github.com/google/go-github/v71/github/dependabot.go b/vendor/github.com/google/go-github/v72/github/dependabot.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/dependabot.go rename to vendor/github.com/google/go-github/v72/github/dependabot.go diff --git a/vendor/github.com/google/go-github/v71/github/dependabot_alerts.go b/vendor/github.com/google/go-github/v72/github/dependabot_alerts.go similarity index 94% rename from vendor/github.com/google/go-github/v71/github/dependabot_alerts.go rename to vendor/github.com/google/go-github/v72/github/dependabot_alerts.go index c274f07b..67e624c9 100644 --- a/vendor/github.com/google/go-github/v71/github/dependabot_alerts.go +++ b/vendor/github.com/google/go-github/v72/github/dependabot_alerts.go @@ -29,6 +29,15 @@ type AdvisoryCWEs struct { Name *string `json:"name,omitempty"` } +// AdvisoryEPSS represents the advisory pertaining to the Exploit Prediction Scoring System. +// +// For more information, see: +// https://github.blog/changelog/2024-10-10-epss-scores-in-the-github-advisory-database/ +type AdvisoryEPSS struct { + Percentage float64 `json:"percentage"` + Percentile float64 `json:"percentile"` +} + // DependabotSecurityAdvisory represents the GitHub Security Advisory. type DependabotSecurityAdvisory struct { GHSAID *string `json:"ghsa_id,omitempty"` @@ -39,6 +48,7 @@ type DependabotSecurityAdvisory struct { Severity *string `json:"severity,omitempty"` CVSS *AdvisoryCVSS `json:"cvss,omitempty"` CWEs []*AdvisoryCWEs `json:"cwes,omitempty"` + EPSS *AdvisoryEPSS `json:"epss,omitempty"` Identifiers []*AdvisoryIdentifier `json:"identifiers,omitempty"` References []*AdvisoryReference `json:"references,omitempty"` PublishedAt *Timestamp `json:"published_at,omitempty"` diff --git a/vendor/github.com/google/go-github/v71/github/dependabot_secrets.go b/vendor/github.com/google/go-github/v72/github/dependabot_secrets.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/dependabot_secrets.go rename to vendor/github.com/google/go-github/v72/github/dependabot_secrets.go diff --git a/vendor/github.com/google/go-github/v71/github/dependency_graph.go b/vendor/github.com/google/go-github/v72/github/dependency_graph.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/dependency_graph.go rename to vendor/github.com/google/go-github/v72/github/dependency_graph.go diff --git a/vendor/github.com/google/go-github/v71/github/dependency_graph_snapshots.go b/vendor/github.com/google/go-github/v72/github/dependency_graph_snapshots.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/dependency_graph_snapshots.go rename to vendor/github.com/google/go-github/v72/github/dependency_graph_snapshots.go diff --git a/vendor/github.com/google/go-github/v71/github/doc.go b/vendor/github.com/google/go-github/v72/github/doc.go similarity index 99% rename from vendor/github.com/google/go-github/v71/github/doc.go rename to vendor/github.com/google/go-github/v72/github/doc.go index b963051f..8a6112fe 100644 --- a/vendor/github.com/google/go-github/v71/github/doc.go +++ b/vendor/github.com/google/go-github/v72/github/doc.go @@ -8,7 +8,7 @@ Package github provides a client for using the GitHub API. Usage: - import "github.com/google/go-github/v71/github" // with go modules enabled (GO111MODULE=on or outside GOPATH) + import "github.com/google/go-github/v72/github" // with go modules enabled (GO111MODULE=on or outside GOPATH) import "github.com/google/go-github/github" // with go modules disabled Construct a new GitHub client, then use the various services on the client to diff --git a/vendor/github.com/google/go-github/v71/github/emojis.go b/vendor/github.com/google/go-github/v72/github/emojis.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/emojis.go rename to vendor/github.com/google/go-github/v72/github/emojis.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise.go b/vendor/github.com/google/go-github/v72/github/enterprise.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise.go rename to vendor/github.com/google/go-github/v72/github/enterprise.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_actions_hosted_runners.go b/vendor/github.com/google/go-github/v72/github/enterprise_actions_hosted_runners.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_actions_hosted_runners.go rename to vendor/github.com/google/go-github/v72/github/enterprise_actions_hosted_runners.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_actions_runner_groups.go b/vendor/github.com/google/go-github/v72/github/enterprise_actions_runner_groups.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_actions_runner_groups.go rename to vendor/github.com/google/go-github/v72/github/enterprise_actions_runner_groups.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_actions_runners.go b/vendor/github.com/google/go-github/v72/github/enterprise_actions_runners.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_actions_runners.go rename to vendor/github.com/google/go-github/v72/github/enterprise_actions_runners.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_audit_log.go b/vendor/github.com/google/go-github/v72/github/enterprise_audit_log.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_audit_log.go rename to vendor/github.com/google/go-github/v72/github/enterprise_audit_log.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_code_security_and_analysis.go b/vendor/github.com/google/go-github/v72/github/enterprise_code_security_and_analysis.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_code_security_and_analysis.go rename to vendor/github.com/google/go-github/v72/github/enterprise_code_security_and_analysis.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_manage_ghes.go b/vendor/github.com/google/go-github/v72/github/enterprise_manage_ghes.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_manage_ghes.go rename to vendor/github.com/google/go-github/v72/github/enterprise_manage_ghes.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_manage_ghes_config.go b/vendor/github.com/google/go-github/v72/github/enterprise_manage_ghes_config.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_manage_ghes_config.go rename to vendor/github.com/google/go-github/v72/github/enterprise_manage_ghes_config.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_manage_ghes_maintenance.go b/vendor/github.com/google/go-github/v72/github/enterprise_manage_ghes_maintenance.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_manage_ghes_maintenance.go rename to vendor/github.com/google/go-github/v72/github/enterprise_manage_ghes_maintenance.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_manage_ghes_ssh.go b/vendor/github.com/google/go-github/v72/github/enterprise_manage_ghes_ssh.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_manage_ghes_ssh.go rename to vendor/github.com/google/go-github/v72/github/enterprise_manage_ghes_ssh.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_network_configurations.go b/vendor/github.com/google/go-github/v72/github/enterprise_network_configurations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_network_configurations.go rename to vendor/github.com/google/go-github/v72/github/enterprise_network_configurations.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_properties.go b/vendor/github.com/google/go-github/v72/github/enterprise_properties.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_properties.go rename to vendor/github.com/google/go-github/v72/github/enterprise_properties.go diff --git a/vendor/github.com/google/go-github/v71/github/enterprise_rules.go b/vendor/github.com/google/go-github/v72/github/enterprise_rules.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/enterprise_rules.go rename to vendor/github.com/google/go-github/v72/github/enterprise_rules.go diff --git a/vendor/github.com/google/go-github/v71/github/event.go b/vendor/github.com/google/go-github/v72/github/event.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/event.go rename to vendor/github.com/google/go-github/v72/github/event.go diff --git a/vendor/github.com/google/go-github/v71/github/event_types.go b/vendor/github.com/google/go-github/v72/github/event_types.go similarity index 99% rename from vendor/github.com/google/go-github/v71/github/event_types.go rename to vendor/github.com/google/go-github/v72/github/event_types.go index 6a6caf19..b5369865 100644 --- a/vendor/github.com/google/go-github/v71/github/event_types.go +++ b/vendor/github.com/google/go-github/v72/github/event_types.go @@ -1446,6 +1446,26 @@ type PushEventRepoOwner struct { Email *string `json:"email,omitempty"` } +// RegistryPackageEvent represents activity related to GitHub Packages. +// The Webhook event name is "registry_package". +// +// This event is triggered when a GitHub Package is published or updated. +// +// GitHub API docs: https://docs.github.com/en/webhooks/webhook-events-and-payloads#registry_package +type RegistryPackageEvent struct { + // Action is the action that was performed. + // Can be "published" or "updated". + Action *string `json:"action,omitempty"` + RegistryPackage *Package `json:"registry_package,omitempty"` + Repository *Repository `json:"repository,omitempty"` + Organization *Organization `json:"organization,omitempty"` + Enterprise *Enterprise `json:"enterprise,omitempty"` + Sender *User `json:"sender,omitempty"` + + // The following fields are only populated by Webhook events. + Installation *Installation `json:"installation,omitempty"` +} + // ReleaseEvent is triggered when a release is published, unpublished, created, // edited, deleted, or prereleased. // The Webhook event name is "release". diff --git a/vendor/github.com/google/go-github/v71/github/gists.go b/vendor/github.com/google/go-github/v72/github/gists.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/gists.go rename to vendor/github.com/google/go-github/v72/github/gists.go diff --git a/vendor/github.com/google/go-github/v71/github/gists_comments.go b/vendor/github.com/google/go-github/v72/github/gists_comments.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/gists_comments.go rename to vendor/github.com/google/go-github/v72/github/gists_comments.go diff --git a/vendor/github.com/google/go-github/v71/github/git.go b/vendor/github.com/google/go-github/v72/github/git.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/git.go rename to vendor/github.com/google/go-github/v72/github/git.go diff --git a/vendor/github.com/google/go-github/v71/github/git_blobs.go b/vendor/github.com/google/go-github/v72/github/git_blobs.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/git_blobs.go rename to vendor/github.com/google/go-github/v72/github/git_blobs.go diff --git a/vendor/github.com/google/go-github/v71/github/git_commits.go b/vendor/github.com/google/go-github/v72/github/git_commits.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/git_commits.go rename to vendor/github.com/google/go-github/v72/github/git_commits.go diff --git a/vendor/github.com/google/go-github/v71/github/git_refs.go b/vendor/github.com/google/go-github/v72/github/git_refs.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/git_refs.go rename to vendor/github.com/google/go-github/v72/github/git_refs.go diff --git a/vendor/github.com/google/go-github/v71/github/git_tags.go b/vendor/github.com/google/go-github/v72/github/git_tags.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/git_tags.go rename to vendor/github.com/google/go-github/v72/github/git_tags.go diff --git a/vendor/github.com/google/go-github/v71/github/git_trees.go b/vendor/github.com/google/go-github/v72/github/git_trees.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/git_trees.go rename to vendor/github.com/google/go-github/v72/github/git_trees.go diff --git a/vendor/github.com/google/go-github/v71/github/github-accessors.go b/vendor/github.com/google/go-github/v72/github/github-accessors.go similarity index 99% rename from vendor/github.com/google/go-github/v71/github/github-accessors.go rename to vendor/github.com/google/go-github/v72/github/github-accessors.go index 45fa9075..6378b40b 100644 --- a/vendor/github.com/google/go-github/v71/github/github-accessors.go +++ b/vendor/github.com/google/go-github/v72/github/github-accessors.go @@ -6022,38 +6022,6 @@ func (c *CreateUpdateEnvironment) GetWaitTimer() int { return *c.WaitTimer } -// GetRepositoryID returns the RepositoryID field if it's non-nil, zero value otherwise. -func (c *CreateUpdateRequiredWorkflowOptions) GetRepositoryID() int64 { - if c == nil || c.RepositoryID == nil { - return 0 - } - return *c.RepositoryID -} - -// GetScope returns the Scope field if it's non-nil, zero value otherwise. -func (c *CreateUpdateRequiredWorkflowOptions) GetScope() string { - if c == nil || c.Scope == nil { - return "" - } - return *c.Scope -} - -// GetSelectedRepositoryIDs returns the SelectedRepositoryIDs field. -func (c *CreateUpdateRequiredWorkflowOptions) GetSelectedRepositoryIDs() *SelectedRepoIDs { - if c == nil { - return nil - } - return c.SelectedRepositoryIDs -} - -// GetWorkflowFilePath returns the WorkflowFilePath field if it's non-nil, zero value otherwise. -func (c *CreateUpdateRequiredWorkflowOptions) GetWorkflowFilePath() string { - if c == nil || c.WorkflowFilePath == nil { - return "" - } - return *c.WorkflowFilePath -} - // GetEmail returns the Email field if it's non-nil, zero value otherwise. func (c *CreateUserRequest) GetEmail() string { if c == nil || c.Email == nil { @@ -6886,6 +6854,14 @@ func (d *DependabotSecurityAdvisory) GetDescription() string { return *d.Description } +// GetEPSS returns the EPSS field. +func (d *DependabotSecurityAdvisory) GetEPSS() *AdvisoryEPSS { + if d == nil { + return nil + } + return d.EPSS +} + // GetGHSAID returns the GHSAID field if it's non-nil, zero value otherwise. func (d *DependabotSecurityAdvisory) GetGHSAID() string { if d == nil || d.GHSAID == nil { @@ -12430,6 +12406,14 @@ func (i *IssueRequest) GetTitle() string { return *i.Title } +// GetType returns the Type field if it's non-nil, zero value otherwise. +func (i *IssueRequest) GetType() string { + if i == nil || i.Type == nil { + return "" + } + return *i.Type +} + // GetAction returns the Action field if it's non-nil, zero value otherwise. func (i *IssuesEvent) GetAction() string { if i == nil || i.Action == nil { @@ -15694,94 +15678,6 @@ func (o *OrgBlockEvent) GetSender() *User { return o.Sender } -// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflow) GetCreatedAt() Timestamp { - if o == nil || o.CreatedAt == nil { - return Timestamp{} - } - return *o.CreatedAt -} - -// GetID returns the ID field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflow) GetID() int64 { - if o == nil || o.ID == nil { - return 0 - } - return *o.ID -} - -// GetName returns the Name field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflow) GetName() string { - if o == nil || o.Name == nil { - return "" - } - return *o.Name -} - -// GetPath returns the Path field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflow) GetPath() string { - if o == nil || o.Path == nil { - return "" - } - return *o.Path -} - -// GetRef returns the Ref field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflow) GetRef() string { - if o == nil || o.Ref == nil { - return "" - } - return *o.Ref -} - -// GetRepository returns the Repository field. -func (o *OrgRequiredWorkflow) GetRepository() *Repository { - if o == nil { - return nil - } - return o.Repository -} - -// GetScope returns the Scope field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflow) GetScope() string { - if o == nil || o.Scope == nil { - return "" - } - return *o.Scope -} - -// GetSelectedRepositoriesURL returns the SelectedRepositoriesURL field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflow) GetSelectedRepositoriesURL() string { - if o == nil || o.SelectedRepositoriesURL == nil { - return "" - } - return *o.SelectedRepositoriesURL -} - -// GetState returns the State field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflow) GetState() string { - if o == nil || o.State == nil { - return "" - } - return *o.State -} - -// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflow) GetUpdatedAt() Timestamp { - if o == nil || o.UpdatedAt == nil { - return Timestamp{} - } - return *o.UpdatedAt -} - -// GetTotalCount returns the TotalCount field if it's non-nil, zero value otherwise. -func (o *OrgRequiredWorkflows) GetTotalCount() int { - if o == nil || o.TotalCount == nil { - return 0 - } - return *o.TotalCount -} - // GetDisabledOrgs returns the DisabledOrgs field if it's non-nil, zero value otherwise. func (o *OrgStats) GetDisabledOrgs() int { if o == nil || o.DisabledOrgs == nil { @@ -20982,6 +20878,62 @@ func (r *RegistrationToken) GetToken() string { return *r.Token } +// GetAction returns the Action field if it's non-nil, zero value otherwise. +func (r *RegistryPackageEvent) GetAction() string { + if r == nil || r.Action == nil { + return "" + } + return *r.Action +} + +// GetEnterprise returns the Enterprise field. +func (r *RegistryPackageEvent) GetEnterprise() *Enterprise { + if r == nil { + return nil + } + return r.Enterprise +} + +// GetInstallation returns the Installation field. +func (r *RegistryPackageEvent) GetInstallation() *Installation { + if r == nil { + return nil + } + return r.Installation +} + +// GetOrganization returns the Organization field. +func (r *RegistryPackageEvent) GetOrganization() *Organization { + if r == nil { + return nil + } + return r.Organization +} + +// GetRegistryPackage returns the RegistryPackage field. +func (r *RegistryPackageEvent) GetRegistryPackage() *Package { + if r == nil { + return nil + } + return r.RegistryPackage +} + +// GetRepository returns the Repository field. +func (r *RegistryPackageEvent) GetRepository() *Repository { + if r == nil { + return nil + } + return r.Repository +} + +// GetSender returns the Sender field. +func (r *RegistryPackageEvent) GetSender() *User { + if r == nil { + return nil + } + return r.Sender +} + // GetBrowserDownloadURL returns the BrowserDownloadURL field if it's non-nil, zero value otherwise. func (r *ReleaseAsset) GetBrowserDownloadURL() string { if r == nil || r.BrowserDownloadURL == nil { @@ -21350,102 +21302,6 @@ func (r *RepoName) GetFrom() string { return *r.From } -// GetBadgeURL returns the BadgeURL field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetBadgeURL() string { - if r == nil || r.BadgeURL == nil { - return "" - } - return *r.BadgeURL -} - -// GetCreatedAt returns the CreatedAt field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetCreatedAt() Timestamp { - if r == nil || r.CreatedAt == nil { - return Timestamp{} - } - return *r.CreatedAt -} - -// GetHTMLURL returns the HTMLURL field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetHTMLURL() string { - if r == nil || r.HTMLURL == nil { - return "" - } - return *r.HTMLURL -} - -// GetID returns the ID field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetID() int64 { - if r == nil || r.ID == nil { - return 0 - } - return *r.ID -} - -// GetName returns the Name field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetName() string { - if r == nil || r.Name == nil { - return "" - } - return *r.Name -} - -// GetNodeID returns the NodeID field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetNodeID() string { - if r == nil || r.NodeID == nil { - return "" - } - return *r.NodeID -} - -// GetPath returns the Path field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetPath() string { - if r == nil || r.Path == nil { - return "" - } - return *r.Path -} - -// GetSourceRepository returns the SourceRepository field. -func (r *RepoRequiredWorkflow) GetSourceRepository() *Repository { - if r == nil { - return nil - } - return r.SourceRepository -} - -// GetState returns the State field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetState() string { - if r == nil || r.State == nil { - return "" - } - return *r.State -} - -// GetUpdatedAt returns the UpdatedAt field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetUpdatedAt() Timestamp { - if r == nil || r.UpdatedAt == nil { - return Timestamp{} - } - return *r.UpdatedAt -} - -// GetURL returns the URL field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflow) GetURL() string { - if r == nil || r.URL == nil { - return "" - } - return *r.URL -} - -// GetTotalCount returns the TotalCount field if it's non-nil, zero value otherwise. -func (r *RepoRequiredWorkflows) GetTotalCount() int { - if r == nil || r.TotalCount == nil { - return 0 - } - return *r.TotalCount -} - // GetIncompleteResults returns the IncompleteResults field if it's non-nil, zero value otherwise. func (r *RepositoriesSearchResult) GetIncompleteResults() bool { if r == nil || r.IncompleteResults == nil { @@ -22934,6 +22790,14 @@ func (r *RepositoryLicense) GetURL() string { return *r.URL } +// GetIncludesParents returns the IncludesParents field if it's non-nil, zero value otherwise. +func (r *RepositoryListRulesetsOptions) GetIncludesParents() bool { + if r == nil || r.IncludesParents == nil { + return false + } + return *r.IncludesParents +} + // GetBase returns the Base field if it's non-nil, zero value otherwise. func (r *RepositoryMergeRequest) GetBase() string { if r == nil || r.Base == nil { @@ -24078,14 +23942,6 @@ func (r *RequiredStatusChecksRuleParameters) GetDoNotEnforceOnCreate() bool { return *r.DoNotEnforceOnCreate } -// GetTotalCount returns the TotalCount field if it's non-nil, zero value otherwise. -func (r *RequiredWorkflowSelectedRepos) GetTotalCount() int { - if r == nil || r.TotalCount == nil { - return 0 - } - return *r.TotalCount -} - // GetNodeID returns the NodeID field if it's non-nil, zero value otherwise. func (r *ReviewersRequest) GetNodeID() string { if r == nil || r.NodeID == nil { @@ -24846,6 +24702,14 @@ func (s *SecretScanningAlert) GetHTMLURL() string { return *s.HTMLURL } +// GetIsBase64Encoded returns the IsBase64Encoded field if it's non-nil, zero value otherwise. +func (s *SecretScanningAlert) GetIsBase64Encoded() bool { + if s == nil || s.IsBase64Encoded == nil { + return false + } + return *s.IsBase64Encoded +} + // GetLocationsURL returns the LocationsURL field if it's non-nil, zero value otherwise. func (s *SecretScanningAlert) GetLocationsURL() string { if s == nil || s.LocationsURL == nil { @@ -24854,6 +24718,14 @@ func (s *SecretScanningAlert) GetLocationsURL() string { return *s.LocationsURL } +// GetMultiRepo returns the MultiRepo field if it's non-nil, zero value otherwise. +func (s *SecretScanningAlert) GetMultiRepo() bool { + if s == nil || s.MultiRepo == nil { + return false + } + return *s.MultiRepo +} + // GetNumber returns the Number field if it's non-nil, zero value otherwise. func (s *SecretScanningAlert) GetNumber() int { if s == nil || s.Number == nil { @@ -24862,6 +24734,14 @@ func (s *SecretScanningAlert) GetNumber() int { return *s.Number } +// GetPubliclyLeaked returns the PubliclyLeaked field if it's non-nil, zero value otherwise. +func (s *SecretScanningAlert) GetPubliclyLeaked() bool { + if s == nil || s.PubliclyLeaked == nil { + return false + } + return *s.PubliclyLeaked +} + // GetPushProtectionBypassed returns the PushProtectionBypassed field if it's non-nil, zero value otherwise. func (s *SecretScanningAlert) GetPushProtectionBypassed() bool { if s == nil || s.PushProtectionBypassed == nil { @@ -24886,6 +24766,38 @@ func (s *SecretScanningAlert) GetPushProtectionBypassedBy() *User { return s.PushProtectionBypassedBy } +// GetPushProtectionBypassRequestComment returns the PushProtectionBypassRequestComment field if it's non-nil, zero value otherwise. +func (s *SecretScanningAlert) GetPushProtectionBypassRequestComment() string { + if s == nil || s.PushProtectionBypassRequestComment == nil { + return "" + } + return *s.PushProtectionBypassRequestComment +} + +// GetPushProtectionBypassRequestHTMLURL returns the PushProtectionBypassRequestHTMLURL field if it's non-nil, zero value otherwise. +func (s *SecretScanningAlert) GetPushProtectionBypassRequestHTMLURL() string { + if s == nil || s.PushProtectionBypassRequestHTMLURL == nil { + return "" + } + return *s.PushProtectionBypassRequestHTMLURL +} + +// GetPushProtectionBypassRequestReviewer returns the PushProtectionBypassRequestReviewer field. +func (s *SecretScanningAlert) GetPushProtectionBypassRequestReviewer() *User { + if s == nil { + return nil + } + return s.PushProtectionBypassRequestReviewer +} + +// GetPushProtectionBypassRequestReviewerComment returns the PushProtectionBypassRequestReviewerComment field if it's non-nil, zero value otherwise. +func (s *SecretScanningAlert) GetPushProtectionBypassRequestReviewerComment() string { + if s == nil || s.PushProtectionBypassRequestReviewerComment == nil { + return "" + } + return *s.PushProtectionBypassRequestReviewerComment +} + // GetRepository returns the Repository field. func (s *SecretScanningAlert) GetRepository() *Repository { if s == nil { @@ -24974,6 +24886,14 @@ func (s *SecretScanningAlert) GetURL() string { return *s.URL } +// GetValidity returns the Validity field if it's non-nil, zero value otherwise. +func (s *SecretScanningAlert) GetValidity() string { + if s == nil || s.Validity == nil { + return "" + } + return *s.Validity +} + // GetAction returns the Action field if it's non-nil, zero value otherwise. func (s *SecretScanningAlertEvent) GetAction() string { if s == nil || s.Action == nil { diff --git a/vendor/github.com/google/go-github/v71/github/github.go b/vendor/github.com/google/go-github/v72/github/github.go similarity index 99% rename from vendor/github.com/google/go-github/v71/github/github.go rename to vendor/github.com/google/go-github/v72/github/github.go index ddafffb2..a3b1941e 100644 --- a/vendor/github.com/google/go-github/v71/github/github.go +++ b/vendor/github.com/google/go-github/v72/github/github.go @@ -29,7 +29,7 @@ import ( ) const ( - Version = "v71.0.0" + Version = "v72.0.0" defaultAPIVersion = "2022-11-28" defaultBaseURL = "https://api.github.com/" diff --git a/vendor/github.com/google/go-github/v71/github/gitignore.go b/vendor/github.com/google/go-github/v72/github/gitignore.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/gitignore.go rename to vendor/github.com/google/go-github/v72/github/gitignore.go diff --git a/vendor/github.com/google/go-github/v71/github/interactions.go b/vendor/github.com/google/go-github/v72/github/interactions.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/interactions.go rename to vendor/github.com/google/go-github/v72/github/interactions.go diff --git a/vendor/github.com/google/go-github/v71/github/interactions_orgs.go b/vendor/github.com/google/go-github/v72/github/interactions_orgs.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/interactions_orgs.go rename to vendor/github.com/google/go-github/v72/github/interactions_orgs.go diff --git a/vendor/github.com/google/go-github/v71/github/interactions_repos.go b/vendor/github.com/google/go-github/v72/github/interactions_repos.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/interactions_repos.go rename to vendor/github.com/google/go-github/v72/github/interactions_repos.go diff --git a/vendor/github.com/google/go-github/v71/github/issue_import.go b/vendor/github.com/google/go-github/v72/github/issue_import.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/issue_import.go rename to vendor/github.com/google/go-github/v72/github/issue_import.go diff --git a/vendor/github.com/google/go-github/v71/github/issues.go b/vendor/github.com/google/go-github/v72/github/issues.go similarity index 97% rename from vendor/github.com/google/go-github/v71/github/issues.go rename to vendor/github.com/google/go-github/v72/github/issues.go index 6d3a6b15..395d64cf 100644 --- a/vendor/github.com/google/go-github/v71/github/issues.go +++ b/vendor/github.com/google/go-github/v72/github/issues.go @@ -90,6 +90,7 @@ type IssueRequest struct { StateReason *string `json:"state_reason,omitempty"` Milestone *int `json:"milestone,omitempty"` Assignees *[]string `json:"assignees,omitempty"` + Type *string `json:"type,omitempty"` } // IssueListOptions specifies the optional parameters to the IssuesService.List @@ -117,6 +118,10 @@ type IssueListOptions struct { // Since filters issues by time. Since time.Time `url:"since,omitempty"` + ListCursorOptions + + // Add ListOptions so offset pagination with integer type "page" query parameter is accepted + // since ListCursorOptions accepts "page" as string only. ListOptions } @@ -233,6 +238,10 @@ type IssueListByRepoOptions struct { // Since filters issues by time. Since time.Time `url:"since,omitempty"` + ListCursorOptions + + // Add ListOptions so offset pagination with integer type "page" query parameter is accepted + // since ListCursorOptions accepts "page" as string only. ListOptions } diff --git a/vendor/github.com/google/go-github/v71/github/issues_assignees.go b/vendor/github.com/google/go-github/v72/github/issues_assignees.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/issues_assignees.go rename to vendor/github.com/google/go-github/v72/github/issues_assignees.go diff --git a/vendor/github.com/google/go-github/v71/github/issues_comments.go b/vendor/github.com/google/go-github/v72/github/issues_comments.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/issues_comments.go rename to vendor/github.com/google/go-github/v72/github/issues_comments.go diff --git a/vendor/github.com/google/go-github/v71/github/issues_events.go b/vendor/github.com/google/go-github/v72/github/issues_events.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/issues_events.go rename to vendor/github.com/google/go-github/v72/github/issues_events.go diff --git a/vendor/github.com/google/go-github/v71/github/issues_labels.go b/vendor/github.com/google/go-github/v72/github/issues_labels.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/issues_labels.go rename to vendor/github.com/google/go-github/v72/github/issues_labels.go diff --git a/vendor/github.com/google/go-github/v71/github/issues_milestones.go b/vendor/github.com/google/go-github/v72/github/issues_milestones.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/issues_milestones.go rename to vendor/github.com/google/go-github/v72/github/issues_milestones.go diff --git a/vendor/github.com/google/go-github/v71/github/issues_timeline.go b/vendor/github.com/google/go-github/v72/github/issues_timeline.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/issues_timeline.go rename to vendor/github.com/google/go-github/v72/github/issues_timeline.go diff --git a/vendor/github.com/google/go-github/v71/github/licenses.go b/vendor/github.com/google/go-github/v72/github/licenses.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/licenses.go rename to vendor/github.com/google/go-github/v72/github/licenses.go diff --git a/vendor/github.com/google/go-github/v71/github/markdown.go b/vendor/github.com/google/go-github/v72/github/markdown.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/markdown.go rename to vendor/github.com/google/go-github/v72/github/markdown.go diff --git a/vendor/github.com/google/go-github/v71/github/messages.go b/vendor/github.com/google/go-github/v72/github/messages.go similarity index 99% rename from vendor/github.com/google/go-github/v71/github/messages.go rename to vendor/github.com/google/go-github/v72/github/messages.go index 59b214b3..2b5cce75 100644 --- a/vendor/github.com/google/go-github/v71/github/messages.go +++ b/vendor/github.com/google/go-github/v72/github/messages.go @@ -95,6 +95,7 @@ var ( "pull_request_review_thread": &PullRequestReviewThreadEvent{}, "pull_request_target": &PullRequestTargetEvent{}, "push": &PushEvent{}, + "registry_package": &RegistryPackageEvent{}, "repository": &RepositoryEvent{}, "repository_dispatch": &RepositoryDispatchEvent{}, "repository_import": &RepositoryImportEvent{}, diff --git a/vendor/github.com/google/go-github/v71/github/meta.go b/vendor/github.com/google/go-github/v72/github/meta.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/meta.go rename to vendor/github.com/google/go-github/v72/github/meta.go diff --git a/vendor/github.com/google/go-github/v71/github/migrations.go b/vendor/github.com/google/go-github/v72/github/migrations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/migrations.go rename to vendor/github.com/google/go-github/v72/github/migrations.go diff --git a/vendor/github.com/google/go-github/v71/github/migrations_source_import.go b/vendor/github.com/google/go-github/v72/github/migrations_source_import.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/migrations_source_import.go rename to vendor/github.com/google/go-github/v72/github/migrations_source_import.go diff --git a/vendor/github.com/google/go-github/v71/github/migrations_user.go b/vendor/github.com/google/go-github/v72/github/migrations_user.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/migrations_user.go rename to vendor/github.com/google/go-github/v72/github/migrations_user.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs.go b/vendor/github.com/google/go-github/v72/github/orgs.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs.go rename to vendor/github.com/google/go-github/v72/github/orgs.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_actions_allowed.go b/vendor/github.com/google/go-github/v72/github/orgs_actions_allowed.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_actions_allowed.go rename to vendor/github.com/google/go-github/v72/github/orgs_actions_allowed.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_actions_permissions.go b/vendor/github.com/google/go-github/v72/github/orgs_actions_permissions.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_actions_permissions.go rename to vendor/github.com/google/go-github/v72/github/orgs_actions_permissions.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_attestations.go b/vendor/github.com/google/go-github/v72/github/orgs_attestations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_attestations.go rename to vendor/github.com/google/go-github/v72/github/orgs_attestations.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_audit_log.go b/vendor/github.com/google/go-github/v72/github/orgs_audit_log.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_audit_log.go rename to vendor/github.com/google/go-github/v72/github/orgs_audit_log.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_codesecurity_configurations.go b/vendor/github.com/google/go-github/v72/github/orgs_codesecurity_configurations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_codesecurity_configurations.go rename to vendor/github.com/google/go-github/v72/github/orgs_codesecurity_configurations.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_credential_authorizations.go b/vendor/github.com/google/go-github/v72/github/orgs_credential_authorizations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_credential_authorizations.go rename to vendor/github.com/google/go-github/v72/github/orgs_credential_authorizations.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_custom_repository_roles.go b/vendor/github.com/google/go-github/v72/github/orgs_custom_repository_roles.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_custom_repository_roles.go rename to vendor/github.com/google/go-github/v72/github/orgs_custom_repository_roles.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_hooks.go b/vendor/github.com/google/go-github/v72/github/orgs_hooks.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_hooks.go rename to vendor/github.com/google/go-github/v72/github/orgs_hooks.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_hooks_configuration.go b/vendor/github.com/google/go-github/v72/github/orgs_hooks_configuration.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_hooks_configuration.go rename to vendor/github.com/google/go-github/v72/github/orgs_hooks_configuration.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_hooks_deliveries.go b/vendor/github.com/google/go-github/v72/github/orgs_hooks_deliveries.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_hooks_deliveries.go rename to vendor/github.com/google/go-github/v72/github/orgs_hooks_deliveries.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_issue_types.go b/vendor/github.com/google/go-github/v72/github/orgs_issue_types.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_issue_types.go rename to vendor/github.com/google/go-github/v72/github/orgs_issue_types.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_members.go b/vendor/github.com/google/go-github/v72/github/orgs_members.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_members.go rename to vendor/github.com/google/go-github/v72/github/orgs_members.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_network_configurations.go b/vendor/github.com/google/go-github/v72/github/orgs_network_configurations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_network_configurations.go rename to vendor/github.com/google/go-github/v72/github/orgs_network_configurations.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_organization_roles.go b/vendor/github.com/google/go-github/v72/github/orgs_organization_roles.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_organization_roles.go rename to vendor/github.com/google/go-github/v72/github/orgs_organization_roles.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_outside_collaborators.go b/vendor/github.com/google/go-github/v72/github/orgs_outside_collaborators.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_outside_collaborators.go rename to vendor/github.com/google/go-github/v72/github/orgs_outside_collaborators.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_packages.go b/vendor/github.com/google/go-github/v72/github/orgs_packages.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_packages.go rename to vendor/github.com/google/go-github/v72/github/orgs_packages.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_personal_access_tokens.go b/vendor/github.com/google/go-github/v72/github/orgs_personal_access_tokens.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_personal_access_tokens.go rename to vendor/github.com/google/go-github/v72/github/orgs_personal_access_tokens.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_properties.go b/vendor/github.com/google/go-github/v72/github/orgs_properties.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_properties.go rename to vendor/github.com/google/go-github/v72/github/orgs_properties.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_rules.go b/vendor/github.com/google/go-github/v72/github/orgs_rules.go similarity index 96% rename from vendor/github.com/google/go-github/v71/github/orgs_rules.go rename to vendor/github.com/google/go-github/v72/github/orgs_rules.go index 8cb2e5d1..357eb8ce 100644 --- a/vendor/github.com/google/go-github/v71/github/orgs_rules.go +++ b/vendor/github.com/google/go-github/v72/github/orgs_rules.go @@ -15,9 +15,14 @@ import ( // GitHub API docs: https://docs.github.com/rest/orgs/rules#get-all-organization-repository-rulesets // //meta:operation GET /orgs/{org}/rulesets -func (s *OrganizationsService) GetAllRepositoryRulesets(ctx context.Context, org string) ([]*RepositoryRuleset, *Response, error) { +func (s *OrganizationsService) GetAllRepositoryRulesets(ctx context.Context, org string, opts *ListOptions) ([]*RepositoryRuleset, *Response, error) { u := fmt.Sprintf("orgs/%v/rulesets", org) + u, err := addOptions(u, opts) + if err != nil { + return nil, nil, err + } + req, err := s.client.NewRequest("GET", u, nil) if err != nil { return nil, nil, err diff --git a/vendor/github.com/google/go-github/v71/github/orgs_security_managers.go b/vendor/github.com/google/go-github/v72/github/orgs_security_managers.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_security_managers.go rename to vendor/github.com/google/go-github/v72/github/orgs_security_managers.go diff --git a/vendor/github.com/google/go-github/v71/github/orgs_users_blocking.go b/vendor/github.com/google/go-github/v72/github/orgs_users_blocking.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/orgs_users_blocking.go rename to vendor/github.com/google/go-github/v72/github/orgs_users_blocking.go diff --git a/vendor/github.com/google/go-github/v71/github/packages.go b/vendor/github.com/google/go-github/v72/github/packages.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/packages.go rename to vendor/github.com/google/go-github/v72/github/packages.go diff --git a/vendor/github.com/google/go-github/v71/github/pulls.go b/vendor/github.com/google/go-github/v72/github/pulls.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/pulls.go rename to vendor/github.com/google/go-github/v72/github/pulls.go diff --git a/vendor/github.com/google/go-github/v71/github/pulls_comments.go b/vendor/github.com/google/go-github/v72/github/pulls_comments.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/pulls_comments.go rename to vendor/github.com/google/go-github/v72/github/pulls_comments.go diff --git a/vendor/github.com/google/go-github/v71/github/pulls_reviewers.go b/vendor/github.com/google/go-github/v72/github/pulls_reviewers.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/pulls_reviewers.go rename to vendor/github.com/google/go-github/v72/github/pulls_reviewers.go diff --git a/vendor/github.com/google/go-github/v71/github/pulls_reviews.go b/vendor/github.com/google/go-github/v72/github/pulls_reviews.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/pulls_reviews.go rename to vendor/github.com/google/go-github/v72/github/pulls_reviews.go diff --git a/vendor/github.com/google/go-github/v71/github/pulls_threads.go b/vendor/github.com/google/go-github/v72/github/pulls_threads.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/pulls_threads.go rename to vendor/github.com/google/go-github/v72/github/pulls_threads.go diff --git a/vendor/github.com/google/go-github/v71/github/rate_limit.go b/vendor/github.com/google/go-github/v72/github/rate_limit.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/rate_limit.go rename to vendor/github.com/google/go-github/v72/github/rate_limit.go diff --git a/vendor/github.com/google/go-github/v71/github/reactions.go b/vendor/github.com/google/go-github/v72/github/reactions.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/reactions.go rename to vendor/github.com/google/go-github/v72/github/reactions.go diff --git a/vendor/github.com/google/go-github/v71/github/repos.go b/vendor/github.com/google/go-github/v72/github/repos.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos.go rename to vendor/github.com/google/go-github/v72/github/repos.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_actions_access.go b/vendor/github.com/google/go-github/v72/github/repos_actions_access.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_actions_access.go rename to vendor/github.com/google/go-github/v72/github/repos_actions_access.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_actions_allowed.go b/vendor/github.com/google/go-github/v72/github/repos_actions_allowed.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_actions_allowed.go rename to vendor/github.com/google/go-github/v72/github/repos_actions_allowed.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_actions_permissions.go b/vendor/github.com/google/go-github/v72/github/repos_actions_permissions.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_actions_permissions.go rename to vendor/github.com/google/go-github/v72/github/repos_actions_permissions.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_attestations.go b/vendor/github.com/google/go-github/v72/github/repos_attestations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_attestations.go rename to vendor/github.com/google/go-github/v72/github/repos_attestations.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_autolinks.go b/vendor/github.com/google/go-github/v72/github/repos_autolinks.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_autolinks.go rename to vendor/github.com/google/go-github/v72/github/repos_autolinks.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_codeowners.go b/vendor/github.com/google/go-github/v72/github/repos_codeowners.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_codeowners.go rename to vendor/github.com/google/go-github/v72/github/repos_codeowners.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_collaborators.go b/vendor/github.com/google/go-github/v72/github/repos_collaborators.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_collaborators.go rename to vendor/github.com/google/go-github/v72/github/repos_collaborators.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_comments.go b/vendor/github.com/google/go-github/v72/github/repos_comments.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_comments.go rename to vendor/github.com/google/go-github/v72/github/repos_comments.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_commits.go b/vendor/github.com/google/go-github/v72/github/repos_commits.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_commits.go rename to vendor/github.com/google/go-github/v72/github/repos_commits.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_community_health.go b/vendor/github.com/google/go-github/v72/github/repos_community_health.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_community_health.go rename to vendor/github.com/google/go-github/v72/github/repos_community_health.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_contents.go b/vendor/github.com/google/go-github/v72/github/repos_contents.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_contents.go rename to vendor/github.com/google/go-github/v72/github/repos_contents.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_deployment_branch_policies.go b/vendor/github.com/google/go-github/v72/github/repos_deployment_branch_policies.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_deployment_branch_policies.go rename to vendor/github.com/google/go-github/v72/github/repos_deployment_branch_policies.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_deployment_protection_rules.go b/vendor/github.com/google/go-github/v72/github/repos_deployment_protection_rules.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_deployment_protection_rules.go rename to vendor/github.com/google/go-github/v72/github/repos_deployment_protection_rules.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_deployments.go b/vendor/github.com/google/go-github/v72/github/repos_deployments.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_deployments.go rename to vendor/github.com/google/go-github/v72/github/repos_deployments.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_environments.go b/vendor/github.com/google/go-github/v72/github/repos_environments.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_environments.go rename to vendor/github.com/google/go-github/v72/github/repos_environments.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_forks.go b/vendor/github.com/google/go-github/v72/github/repos_forks.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_forks.go rename to vendor/github.com/google/go-github/v72/github/repos_forks.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_hooks.go b/vendor/github.com/google/go-github/v72/github/repos_hooks.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_hooks.go rename to vendor/github.com/google/go-github/v72/github/repos_hooks.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_hooks_configuration.go b/vendor/github.com/google/go-github/v72/github/repos_hooks_configuration.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_hooks_configuration.go rename to vendor/github.com/google/go-github/v72/github/repos_hooks_configuration.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_hooks_deliveries.go b/vendor/github.com/google/go-github/v72/github/repos_hooks_deliveries.go similarity index 89% rename from vendor/github.com/google/go-github/v71/github/repos_hooks_deliveries.go rename to vendor/github.com/google/go-github/v72/github/repos_hooks_deliveries.go index c8029f62..bcd4b336 100644 --- a/vendor/github.com/google/go-github/v71/github/repos_hooks_deliveries.go +++ b/vendor/github.com/google/go-github/v72/github/repos_hooks_deliveries.go @@ -9,6 +9,7 @@ import ( "context" "encoding/json" "fmt" + "strings" ) // HookDelivery represents the data that is received from GitHub's Webhook Delivery API @@ -39,6 +40,16 @@ func (d HookDelivery) String() string { return Stringify(d) } +// getHeader common function for GetHeader funcs of HookRequest & HookResponse. +func getHeader(headers map[string]string, key string) string { + for k, v := range headers { + if strings.EqualFold(k, key) { + return v + } + } + return "" +} + // HookRequest is a part of HookDelivery that contains // the HTTP headers and the JSON payload of the webhook request. type HookRequest struct { @@ -46,6 +57,11 @@ type HookRequest struct { RawPayload *json.RawMessage `json:"payload,omitempty"` } +// GetHeader gets the value associated with the given key (ignoring key case). +func (r *HookRequest) GetHeader(key string) string { + return getHeader(r.Headers, key) +} + func (r HookRequest) String() string { return Stringify(r) } @@ -57,6 +73,11 @@ type HookResponse struct { RawPayload *json.RawMessage `json:"payload,omitempty"` } +// GetHeader gets the value associated with the given key (ignoring key case). +func (r *HookResponse) GetHeader(key string) string { + return getHeader(r.Headers, key) +} + func (r HookResponse) String() string { return Stringify(r) } diff --git a/vendor/github.com/google/go-github/v71/github/repos_invitations.go b/vendor/github.com/google/go-github/v72/github/repos_invitations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_invitations.go rename to vendor/github.com/google/go-github/v72/github/repos_invitations.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_keys.go b/vendor/github.com/google/go-github/v72/github/repos_keys.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_keys.go rename to vendor/github.com/google/go-github/v72/github/repos_keys.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_lfs.go b/vendor/github.com/google/go-github/v72/github/repos_lfs.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_lfs.go rename to vendor/github.com/google/go-github/v72/github/repos_lfs.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_merging.go b/vendor/github.com/google/go-github/v72/github/repos_merging.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_merging.go rename to vendor/github.com/google/go-github/v72/github/repos_merging.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_pages.go b/vendor/github.com/google/go-github/v72/github/repos_pages.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_pages.go rename to vendor/github.com/google/go-github/v72/github/repos_pages.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_prereceive_hooks.go b/vendor/github.com/google/go-github/v72/github/repos_prereceive_hooks.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_prereceive_hooks.go rename to vendor/github.com/google/go-github/v72/github/repos_prereceive_hooks.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_properties.go b/vendor/github.com/google/go-github/v72/github/repos_properties.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_properties.go rename to vendor/github.com/google/go-github/v72/github/repos_properties.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_releases.go b/vendor/github.com/google/go-github/v72/github/repos_releases.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_releases.go rename to vendor/github.com/google/go-github/v72/github/repos_releases.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_rules.go b/vendor/github.com/google/go-github/v72/github/repos_rules.go similarity index 88% rename from vendor/github.com/google/go-github/v71/github/repos_rules.go rename to vendor/github.com/google/go-github/v72/github/repos_rules.go index d38e35cd..038cefd7 100644 --- a/vendor/github.com/google/go-github/v71/github/repos_rules.go +++ b/vendor/github.com/google/go-github/v72/github/repos_rules.go @@ -38,9 +38,14 @@ type rulesetClearBypassActors struct { // GitHub API docs: https://docs.github.com/rest/repos/rules#get-rules-for-a-branch // //meta:operation GET /repos/{owner}/{repo}/rules/branches/{branch} -func (s *RepositoriesService) GetRulesForBranch(ctx context.Context, owner, repo, branch string) (*BranchRules, *Response, error) { +func (s *RepositoriesService) GetRulesForBranch(ctx context.Context, owner, repo, branch string, opts *ListOptions) (*BranchRules, *Response, error) { u := fmt.Sprintf("repos/%v/%v/rules/branches/%v", owner, repo, branch) + u, err := addOptions(u, opts) + if err != nil { + return nil, nil, err + } + req, err := s.client.NewRequest("GET", u, nil) if err != nil { return nil, nil, err @@ -55,14 +60,28 @@ func (s *RepositoriesService) GetRulesForBranch(ctx context.Context, owner, repo return rules, resp, nil } +// RepositoryListRulesetsOptions specifies optional parameters to the +// RepositoriesService.GetAllRulesets method. +type RepositoryListRulesetsOptions struct { + // IncludesParents indicates whether to include rulesets configured at the organization or enterprise level that apply to the repository. + IncludesParents *bool `url:"includes_parents,omitempty"` + ListOptions +} + // GetAllRulesets gets all the repository rulesets for the specified repository. -// If includesParents is true, rulesets configured at the organization or enterprise level that apply to the repository will be returned. +// By default, this endpoint will include rulesets configured at the organization or enterprise level that apply to the repository. +// To exclude those rulesets, set the `RepositoryListRulesetsOptions.IncludesParents` parameter to `false`. // // GitHub API docs: https://docs.github.com/rest/repos/rules#get-all-repository-rulesets // //meta:operation GET /repos/{owner}/{repo}/rulesets -func (s *RepositoriesService) GetAllRulesets(ctx context.Context, owner, repo string, includesParents bool) ([]*RepositoryRuleset, *Response, error) { - u := fmt.Sprintf("repos/%v/%v/rulesets?includes_parents=%v", owner, repo, includesParents) +func (s *RepositoriesService) GetAllRulesets(ctx context.Context, owner, repo string, opts *RepositoryListRulesetsOptions) ([]*RepositoryRuleset, *Response, error) { + u := fmt.Sprintf("repos/%v/%v/rulesets", owner, repo) + + u, err := addOptions(u, opts) + if err != nil { + return nil, nil, err + } req, err := s.client.NewRequest("GET", u, nil) if err != nil { diff --git a/vendor/github.com/google/go-github/v71/github/repos_stats.go b/vendor/github.com/google/go-github/v72/github/repos_stats.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_stats.go rename to vendor/github.com/google/go-github/v72/github/repos_stats.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_statuses.go b/vendor/github.com/google/go-github/v72/github/repos_statuses.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_statuses.go rename to vendor/github.com/google/go-github/v72/github/repos_statuses.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_tags.go b/vendor/github.com/google/go-github/v72/github/repos_tags.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_tags.go rename to vendor/github.com/google/go-github/v72/github/repos_tags.go diff --git a/vendor/github.com/google/go-github/v71/github/repos_traffic.go b/vendor/github.com/google/go-github/v72/github/repos_traffic.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/repos_traffic.go rename to vendor/github.com/google/go-github/v72/github/repos_traffic.go diff --git a/vendor/github.com/google/go-github/v71/github/rules.go b/vendor/github.com/google/go-github/v72/github/rules.go similarity index 95% rename from vendor/github.com/google/go-github/v71/github/rules.go rename to vendor/github.com/google/go-github/v72/github/rules.go index 985f0aac..4def2d19 100644 --- a/vendor/github.com/google/go-github/v71/github/rules.go +++ b/vendor/github.com/google/go-github/v72/github/rules.go @@ -99,14 +99,34 @@ const ( MergeGroupingStrategyHeadGreen MergeGroupingStrategy = "HEADGREEN" ) -// MergeMethod models a GitHub merge method. -type MergeMethod string +// PullRequestMergeMethod is used in PullRequestRuleParameters, +// where the GitHub API expects lowercase merge method values: "merge", "rebase", "squash". +// +// NOTE: GitHub's API inconsistently uses different casing for the same logical values +// across different rules. +// +// TODO: Unify with MergeQueueMergeMethod once the GitHub API uses consistent casing. +type PullRequestMergeMethod string -// This is the set of GitHub merge methods. const ( - MergeMethodMerge MergeMethod = "merge" - MergeMethodRebase MergeMethod = "rebase" - MergeMethodSquash MergeMethod = "squash" + PullRequestMergeMethodMerge PullRequestMergeMethod = "merge" + PullRequestMergeMethodRebase PullRequestMergeMethod = "rebase" + PullRequestMergeMethodSquash PullRequestMergeMethod = "squash" +) + +// MergeQueueMergeMethod is used in MergeQueueRuleParameters, +// where the GitHub API expects uppercase merge method values: "MERGE", "REBASE", "SQUASH". +// +// NOTE: This type exists alongside PullRequestMergeMethod solely due to API casing inconsistencies. +// It enforces the correct usage by API context. +// +// TODO: Unify with PullRequestMergeMethod once the GitHub API uses consistent casing. +type MergeQueueMergeMethod string + +const ( + MergeQueueMergeMethodMerge MergeQueueMergeMethod = "MERGE" + MergeQueueMergeMethodRebase MergeQueueMergeMethod = "REBASE" + MergeQueueMergeMethodSquash MergeQueueMergeMethod = "SQUASH" ) // PatternRuleOperator models a GitHub pattern rule operator. @@ -383,7 +403,7 @@ type MergeQueueRuleParameters struct { GroupingStrategy MergeGroupingStrategy `json:"grouping_strategy"` MaxEntriesToBuild int `json:"max_entries_to_build"` MaxEntriesToMerge int `json:"max_entries_to_merge"` - MergeMethod MergeMethod `json:"merge_method"` + MergeMethod MergeQueueMergeMethod `json:"merge_method"` MinEntriesToMerge int `json:"min_entries_to_merge"` MinEntriesToMergeWaitMinutes int `json:"min_entries_to_merge_wait_minutes"` } @@ -395,13 +415,13 @@ type RequiredDeploymentsRuleParameters struct { // PullRequestRuleParameters represents the pull_request rule parameters. type PullRequestRuleParameters struct { - AllowedMergeMethods []MergeMethod `json:"allowed_merge_methods"` - AutomaticCopilotCodeReviewEnabled *bool `json:"automatic_copilot_code_review_enabled,omitempty"` - DismissStaleReviewsOnPush bool `json:"dismiss_stale_reviews_on_push"` - RequireCodeOwnerReview bool `json:"require_code_owner_review"` - RequireLastPushApproval bool `json:"require_last_push_approval"` - RequiredApprovingReviewCount int `json:"required_approving_review_count"` - RequiredReviewThreadResolution bool `json:"required_review_thread_resolution"` + AllowedMergeMethods []PullRequestMergeMethod `json:"allowed_merge_methods"` + AutomaticCopilotCodeReviewEnabled *bool `json:"automatic_copilot_code_review_enabled,omitempty"` + DismissStaleReviewsOnPush bool `json:"dismiss_stale_reviews_on_push"` + RequireCodeOwnerReview bool `json:"require_code_owner_review"` + RequireLastPushApproval bool `json:"require_last_push_approval"` + RequiredApprovingReviewCount int `json:"required_approving_review_count"` + RequiredReviewThreadResolution bool `json:"required_review_thread_resolution"` } // RequiredStatusChecksRuleParameters represents the required status checks rule parameters. diff --git a/vendor/github.com/google/go-github/v71/github/scim.go b/vendor/github.com/google/go-github/v72/github/scim.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/scim.go rename to vendor/github.com/google/go-github/v72/github/scim.go diff --git a/vendor/github.com/google/go-github/v71/github/search.go b/vendor/github.com/google/go-github/v72/github/search.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/search.go rename to vendor/github.com/google/go-github/v72/github/search.go diff --git a/vendor/github.com/google/go-github/v71/github/secret_scanning.go b/vendor/github.com/google/go-github/v72/github/secret_scanning.go similarity index 78% rename from vendor/github.com/google/go-github/v71/github/secret_scanning.go rename to vendor/github.com/google/go-github/v72/github/secret_scanning.go index 4eeeba3d..ad2312d0 100644 --- a/vendor/github.com/google/go-github/v71/github/secret_scanning.go +++ b/vendor/github.com/google/go-github/v72/github/secret_scanning.go @@ -16,24 +16,32 @@ type SecretScanningService service // SecretScanningAlert represents a GitHub secret scanning alert. type SecretScanningAlert struct { - Number *int `json:"number,omitempty"` - CreatedAt *Timestamp `json:"created_at,omitempty"` - URL *string `json:"url,omitempty"` - HTMLURL *string `json:"html_url,omitempty"` - LocationsURL *string `json:"locations_url,omitempty"` - State *string `json:"state,omitempty"` - Resolution *string `json:"resolution,omitempty"` - ResolvedAt *Timestamp `json:"resolved_at,omitempty"` - ResolvedBy *User `json:"resolved_by,omitempty"` - SecretType *string `json:"secret_type,omitempty"` - SecretTypeDisplayName *string `json:"secret_type_display_name,omitempty"` - Secret *string `json:"secret,omitempty"` - Repository *Repository `json:"repository,omitempty"` - UpdatedAt *Timestamp `json:"updated_at,omitempty"` - PushProtectionBypassed *bool `json:"push_protection_bypassed,omitempty"` - PushProtectionBypassedBy *User `json:"push_protection_bypassed_by,omitempty"` - PushProtectionBypassedAt *Timestamp `json:"push_protection_bypassed_at,omitempty"` - ResolutionComment *string `json:"resolution_comment,omitempty"` + Number *int `json:"number,omitempty"` + CreatedAt *Timestamp `json:"created_at,omitempty"` + URL *string `json:"url,omitempty"` + HTMLURL *string `json:"html_url,omitempty"` + LocationsURL *string `json:"locations_url,omitempty"` + State *string `json:"state,omitempty"` + Resolution *string `json:"resolution,omitempty"` + ResolvedAt *Timestamp `json:"resolved_at,omitempty"` + ResolvedBy *User `json:"resolved_by,omitempty"` + SecretType *string `json:"secret_type,omitempty"` + SecretTypeDisplayName *string `json:"secret_type_display_name,omitempty"` + Secret *string `json:"secret,omitempty"` + Repository *Repository `json:"repository,omitempty"` + UpdatedAt *Timestamp `json:"updated_at,omitempty"` + IsBase64Encoded *bool `json:"is_base64_encoded,omitempty"` + MultiRepo *bool `json:"multi_repo,omitempty"` + PubliclyLeaked *bool `json:"publicly_leaked,omitempty"` + PushProtectionBypassed *bool `json:"push_protection_bypassed,omitempty"` + PushProtectionBypassedBy *User `json:"push_protection_bypassed_by,omitempty"` + PushProtectionBypassedAt *Timestamp `json:"push_protection_bypassed_at,omitempty"` + ResolutionComment *string `json:"resolution_comment,omitempty"` + PushProtectionBypassRequestComment *string `json:"push_protection_bypass_request_comment,omitempty"` + PushProtectionBypassRequestHTMLURL *string `json:"push_protection_bypass_request_html_url,omitempty"` + PushProtectionBypassRequestReviewer *User `json:"push_protection_bypass_request_reviewer,omitempty"` + PushProtectionBypassRequestReviewerComment *string `json:"push_protection_bypass_request_reviewer_comment,omitempty"` + Validity *string `json:"validity,omitempty"` } // SecretScanningAlertLocation represents the location for a secret scanning alert. @@ -72,6 +80,12 @@ type SecretScanningAlertListOptions struct { // Valid options are active, inactive, and unknown. Validity string `url:"validity,omitempty"` + // A boolean value representing whether or not to filter alerts by the publicly-leaked tag being present. Default: false. + IsPubliclyLeaked bool `url:"is_publicly_leaked,omitempty"` + + // A boolean value representing whether or not to filter alerts by the multi-repo tag being present. Default: false. + IsMultiRepo bool `url:"is_multi_repo,omitempty"` + // The direction to sort the results by. Possible values are: asc, desc. Default: desc. Direction string `url:"direction,omitempty"` diff --git a/vendor/github.com/google/go-github/v71/github/security_advisories.go b/vendor/github.com/google/go-github/v72/github/security_advisories.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/security_advisories.go rename to vendor/github.com/google/go-github/v72/github/security_advisories.go diff --git a/vendor/github.com/google/go-github/v71/github/strings.go b/vendor/github.com/google/go-github/v72/github/strings.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/strings.go rename to vendor/github.com/google/go-github/v72/github/strings.go diff --git a/vendor/github.com/google/go-github/v71/github/teams.go b/vendor/github.com/google/go-github/v72/github/teams.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/teams.go rename to vendor/github.com/google/go-github/v72/github/teams.go diff --git a/vendor/github.com/google/go-github/v71/github/teams_discussion_comments.go b/vendor/github.com/google/go-github/v72/github/teams_discussion_comments.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/teams_discussion_comments.go rename to vendor/github.com/google/go-github/v72/github/teams_discussion_comments.go diff --git a/vendor/github.com/google/go-github/v71/github/teams_discussions.go b/vendor/github.com/google/go-github/v72/github/teams_discussions.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/teams_discussions.go rename to vendor/github.com/google/go-github/v72/github/teams_discussions.go diff --git a/vendor/github.com/google/go-github/v71/github/teams_members.go b/vendor/github.com/google/go-github/v72/github/teams_members.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/teams_members.go rename to vendor/github.com/google/go-github/v72/github/teams_members.go diff --git a/vendor/github.com/google/go-github/v71/github/timestamp.go b/vendor/github.com/google/go-github/v72/github/timestamp.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/timestamp.go rename to vendor/github.com/google/go-github/v72/github/timestamp.go diff --git a/vendor/github.com/google/go-github/v71/github/users.go b/vendor/github.com/google/go-github/v72/github/users.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users.go rename to vendor/github.com/google/go-github/v72/github/users.go diff --git a/vendor/github.com/google/go-github/v71/github/users_administration.go b/vendor/github.com/google/go-github/v72/github/users_administration.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users_administration.go rename to vendor/github.com/google/go-github/v72/github/users_administration.go diff --git a/vendor/github.com/google/go-github/v71/github/users_attestations.go b/vendor/github.com/google/go-github/v72/github/users_attestations.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users_attestations.go rename to vendor/github.com/google/go-github/v72/github/users_attestations.go diff --git a/vendor/github.com/google/go-github/v71/github/users_blocking.go b/vendor/github.com/google/go-github/v72/github/users_blocking.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users_blocking.go rename to vendor/github.com/google/go-github/v72/github/users_blocking.go diff --git a/vendor/github.com/google/go-github/v71/github/users_emails.go b/vendor/github.com/google/go-github/v72/github/users_emails.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users_emails.go rename to vendor/github.com/google/go-github/v72/github/users_emails.go diff --git a/vendor/github.com/google/go-github/v71/github/users_followers.go b/vendor/github.com/google/go-github/v72/github/users_followers.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users_followers.go rename to vendor/github.com/google/go-github/v72/github/users_followers.go diff --git a/vendor/github.com/google/go-github/v71/github/users_gpg_keys.go b/vendor/github.com/google/go-github/v72/github/users_gpg_keys.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users_gpg_keys.go rename to vendor/github.com/google/go-github/v72/github/users_gpg_keys.go diff --git a/vendor/github.com/google/go-github/v71/github/users_keys.go b/vendor/github.com/google/go-github/v72/github/users_keys.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users_keys.go rename to vendor/github.com/google/go-github/v72/github/users_keys.go diff --git a/vendor/github.com/google/go-github/v71/github/users_packages.go b/vendor/github.com/google/go-github/v72/github/users_packages.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users_packages.go rename to vendor/github.com/google/go-github/v72/github/users_packages.go diff --git a/vendor/github.com/google/go-github/v71/github/users_ssh_signing_keys.go b/vendor/github.com/google/go-github/v72/github/users_ssh_signing_keys.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/users_ssh_signing_keys.go rename to vendor/github.com/google/go-github/v72/github/users_ssh_signing_keys.go diff --git a/vendor/github.com/google/go-github/v71/github/with_appengine.go b/vendor/github.com/google/go-github/v72/github/with_appengine.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/with_appengine.go rename to vendor/github.com/google/go-github/v72/github/with_appengine.go diff --git a/vendor/github.com/google/go-github/v71/github/without_appengine.go b/vendor/github.com/google/go-github/v72/github/without_appengine.go similarity index 100% rename from vendor/github.com/google/go-github/v71/github/without_appengine.go rename to vendor/github.com/google/go-github/v72/github/without_appengine.go diff --git a/vendor/github.com/prometheus/common/expfmt/text_parse.go b/vendor/github.com/prometheus/common/expfmt/text_parse.go index b4607fe4..4067978a 100644 --- a/vendor/github.com/prometheus/common/expfmt/text_parse.go +++ b/vendor/github.com/prometheus/common/expfmt/text_parse.go @@ -345,8 +345,8 @@ func (p *TextParser) startLabelName() stateFn { } // Special summary/histogram treatment. Don't add 'quantile' and 'le' // labels to 'real' labels. - if !(p.currentMF.GetType() == dto.MetricType_SUMMARY && p.currentLabelPair.GetName() == model.QuantileLabel) && - !(p.currentMF.GetType() == dto.MetricType_HISTOGRAM && p.currentLabelPair.GetName() == model.BucketLabel) { + if (p.currentMF.GetType() != dto.MetricType_SUMMARY || p.currentLabelPair.GetName() != model.QuantileLabel) && + (p.currentMF.GetType() != dto.MetricType_HISTOGRAM || p.currentLabelPair.GetName() != model.BucketLabel) { p.currentLabelPairs = append(p.currentLabelPairs, p.currentLabelPair) } // Check for duplicate label names. diff --git a/vendor/github.com/prometheus/common/model/labels.go b/vendor/github.com/prometheus/common/model/labels.go index f4a38760..de83afe9 100644 --- a/vendor/github.com/prometheus/common/model/labels.go +++ b/vendor/github.com/prometheus/common/model/labels.go @@ -122,7 +122,8 @@ func (ln LabelName) IsValidLegacy() bool { return false } for i, b := range ln { - if !((b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || b == '_' || (b >= '0' && b <= '9' && i > 0)) { + // TODO: Apply De Morgan's law. Make sure there are tests for this. + if !((b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z') || b == '_' || (b >= '0' && b <= '9' && i > 0)) { //nolint:staticcheck return false } } diff --git a/vendor/go.mongodb.org/mongo-driver/bson/bsonrw/extjson_writer.go b/vendor/go.mongodb.org/mongo-driver/bson/bsonrw/extjson_writer.go index 57781ff9..86a29357 100644 --- a/vendor/go.mongodb.org/mongo-driver/bson/bsonrw/extjson_writer.go +++ b/vendor/go.mongodb.org/mongo-driver/bson/bsonrw/extjson_writer.go @@ -468,12 +468,13 @@ func (ejvw *extJSONValueWriter) WriteRegex(pattern string, options string) error return err } + options = sortStringAlphebeticAscending(options) var buf bytes.Buffer buf.WriteString(`{"$regularExpression":{"pattern":`) writeStringWithEscapes(pattern, &buf, ejvw.escapeHTML) - buf.WriteString(`,"options":"`) - buf.WriteString(sortStringAlphebeticAscending(options)) - buf.WriteString(`"}},`) + buf.WriteString(`,"options":`) + writeStringWithEscapes(options, &buf, ejvw.escapeHTML) + buf.WriteString(`}},`) ejvw.buf = append(ejvw.buf, buf.Bytes()...) diff --git a/vendor/go.opentelemetry.io/otel/.golangci.yml b/vendor/go.opentelemetry.io/otel/.golangci.yml index c58e48ab..888e5da8 100644 --- a/vendor/go.opentelemetry.io/otel/.golangci.yml +++ b/vendor/go.opentelemetry.io/otel/.golangci.yml @@ -1,13 +1,9 @@ -# See https://github.com/golangci/golangci-lint#config-file +version: "2" run: - issues-exit-code: 1 #Default - tests: true #Default - + issues-exit-code: 1 + tests: true linters: - # Disable everything by default so upgrades to not include new "default - # enabled" linters. - disable-all: true - # Specifically enable linters we want to use. + default: none enable: - asasalint - bodyclose @@ -15,10 +11,7 @@ linters: - errcheck - errorlint - godot - - gofumpt - - goimports - gosec - - gosimple - govet - ineffassign - misspell @@ -26,227 +19,230 @@ linters: - revive - staticcheck - testifylint - - typecheck - unconvert - - unused - unparam + - unused - usestdlibvars - usetesting - + settings: + depguard: + rules: + auto/sdk: + files: + - '!internal/global/trace.go' + - ~internal/global/trace_test.go + deny: + - pkg: go.opentelemetry.io/auto/sdk + desc: Do not use SDK from automatic instrumentation. + non-tests: + files: + - '!$test' + - '!**/*test/*.go' + - '!**/internal/matchers/*.go' + deny: + - pkg: testing + - pkg: github.com/stretchr/testify + - pkg: crypto/md5 + - pkg: crypto/sha1 + - pkg: crypto/**/pkix + otel-internal: + files: + - '**/sdk/*.go' + - '**/sdk/**/*.go' + - '**/exporters/*.go' + - '**/exporters/**/*.go' + - '**/schema/*.go' + - '**/schema/**/*.go' + - '**/metric/*.go' + - '**/metric/**/*.go' + - '**/bridge/*.go' + - '**/bridge/**/*.go' + - '**/trace/*.go' + - '**/trace/**/*.go' + - '**/log/*.go' + - '**/log/**/*.go' + deny: + - pkg: go.opentelemetry.io/otel/internal$ + desc: Do not use cross-module internal packages. + - pkg: go.opentelemetry.io/otel/internal/internaltest + desc: Do not use cross-module internal packages. + - pkg: go.opentelemetry.io/otel/internal/matchers + desc: Do not use cross-module internal packages. + otlp-internal: + files: + - '!**/exporters/otlp/internal/**/*.go' + deny: + - pkg: go.opentelemetry.io/otel/exporters/otlp/internal + desc: Do not use cross-module internal packages. + otlpmetric-internal: + files: + - '!**/exporters/otlp/otlpmetric/internal/*.go' + - '!**/exporters/otlp/otlpmetric/internal/**/*.go' + deny: + - pkg: go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal + desc: Do not use cross-module internal packages. + otlptrace-internal: + files: + - '!**/exporters/otlp/otlptrace/*.go' + - '!**/exporters/otlp/otlptrace/internal/**.go' + deny: + - pkg: go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal + desc: Do not use cross-module internal packages. + godot: + exclude: + # Exclude links. + - '^ *\[[^]]+\]:' + # Exclude sentence fragments for lists. + - ^[ ]*[-•] + # Exclude sentences prefixing a list. + - :$ + misspell: + locale: US + ignore-rules: + - cancelled + perfsprint: + int-conversion: true + err-error: true + errorf: true + sprintf1: true + strconcat: true + revive: + confidence: 0.01 + rules: + - name: blank-imports + - name: bool-literal-in-expr + - name: constant-logical-expr + - name: context-as-argument + arguments: + - allowTypesBefore: '*testing.T' + disabled: true + - name: context-keys-type + - name: deep-exit + - name: defer + arguments: + - - call-chain + - loop + - name: dot-imports + - name: duplicated-imports + - name: early-return + arguments: + - preserveScope + - name: empty-block + - name: empty-lines + - name: error-naming + - name: error-return + - name: error-strings + - name: errorf + - name: exported + arguments: + - sayRepetitiveInsteadOfStutters + - name: flag-parameter + - name: identical-branches + - name: if-return + - name: import-shadowing + - name: increment-decrement + - name: indent-error-flow + arguments: + - preserveScope + - name: package-comments + - name: range + - name: range-val-in-closure + - name: range-val-address + - name: redefines-builtin-id + - name: string-format + arguments: + - - panic + - /^[^\n]*$/ + - must not contain line breaks + - name: struct-tag + - name: superfluous-else + arguments: + - preserveScope + - name: time-equal + - name: unconditional-recursion + - name: unexported-return + - name: unhandled-error + arguments: + - fmt.Fprint + - fmt.Fprintf + - fmt.Fprintln + - fmt.Print + - fmt.Printf + - fmt.Println + - name: unnecessary-stmt + - name: useless-break + - name: var-declaration + - name: var-naming + arguments: + - ["ID"] # AllowList + - ["Otel", "Aws", "Gcp"] # DenyList + - name: waitgroup-by-value + testifylint: + enable-all: true + disable: + - float-compare + - go-require + - require-error + exclusions: + generated: lax + presets: + - common-false-positives + - legacy + - std-error-handling + rules: + # TODO: Having appropriate comments for exported objects helps development, + # even for objects in internal packages. Appropriate comments for all + # exported objects should be added and this exclusion removed. + - linters: + - revive + path: .*internal/.* + text: exported (method|function|type|const) (.+) should have comment or be unexported + # Yes, they are, but it's okay in a test. + - linters: + - revive + path: _test\.go + text: exported func.*returns unexported type.*which can be annoying to use + # Example test functions should be treated like main. + - linters: + - revive + path: example.*_test\.go + text: calls to (.+) only in main[(][)] or init[(][)] functions + # It's okay to not run gosec and perfsprint in a test. + - linters: + - gosec + - perfsprint + path: _test\.go + # Ignoring gosec G404: Use of weak random number generator (math/rand instead of crypto/rand) + # as we commonly use it in tests and examples. + - linters: + - gosec + text: 'G404:' + # Ignoring gosec G402: TLS MinVersion too low + # as the https://pkg.go.dev/crypto/tls#Config handles MinVersion default well. + - linters: + - gosec + text: 'G402: TLS MinVersion too low.' + paths: + - third_party$ + - builtin$ + - examples$ issues: - # Maximum issues count per one linter. - # Set to 0 to disable. - # Default: 50 - # Setting to unlimited so the linter only is run once to debug all issues. max-issues-per-linter: 0 - # Maximum count of issues with the same text. - # Set to 0 to disable. - # Default: 3 - # Setting to unlimited so the linter only is run once to debug all issues. max-same-issues: 0 - # Excluding configuration per-path, per-linter, per-text and per-source. - exclude-rules: - # TODO: Having appropriate comments for exported objects helps development, - # even for objects in internal packages. Appropriate comments for all - # exported objects should be added and this exclusion removed. - - path: '.*internal/.*' - text: "exported (method|function|type|const) (.+) should have comment or be unexported" - linters: - - revive - # Yes, they are, but it's okay in a test. - - path: _test\.go - text: "exported func.*returns unexported type.*which can be annoying to use" - linters: - - revive - # Example test functions should be treated like main. - - path: example.*_test\.go - text: "calls to (.+) only in main[(][)] or init[(][)] functions" - linters: - - revive - # It's okay to not run gosec and perfsprint in a test. - - path: _test\.go - linters: - - gosec - - perfsprint - # Ignoring gosec G404: Use of weak random number generator (math/rand instead of crypto/rand) - # as we commonly use it in tests and examples. - - text: "G404:" - linters: - - gosec - # Ignoring gosec G402: TLS MinVersion too low - # as the https://pkg.go.dev/crypto/tls#Config handles MinVersion default well. - - text: "G402: TLS MinVersion too low." - linters: - - gosec - include: - # revive exported should have comment or be unexported. - - EXC0012 - # revive package comment should be of the form ... - - EXC0013 - -linters-settings: - depguard: - rules: - non-tests: - files: - - "!$test" - - "!**/*test/*.go" - - "!**/internal/matchers/*.go" - deny: - - pkg: "testing" - - pkg: "github.com/stretchr/testify" - - pkg: "crypto/md5" - - pkg: "crypto/sha1" - - pkg: "crypto/**/pkix" - auto/sdk: - files: - - "!internal/global/trace.go" - - "~internal/global/trace_test.go" - deny: - - pkg: "go.opentelemetry.io/auto/sdk" - desc: Do not use SDK from automatic instrumentation. - otlp-internal: - files: - - "!**/exporters/otlp/internal/**/*.go" - deny: - - pkg: "go.opentelemetry.io/otel/exporters/otlp/internal" - desc: Do not use cross-module internal packages. - otlptrace-internal: - files: - - "!**/exporters/otlp/otlptrace/*.go" - - "!**/exporters/otlp/otlptrace/internal/**.go" - deny: - - pkg: "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal" - desc: Do not use cross-module internal packages. - otlpmetric-internal: - files: - - "!**/exporters/otlp/otlpmetric/internal/*.go" - - "!**/exporters/otlp/otlpmetric/internal/**/*.go" - deny: - - pkg: "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/internal" - desc: Do not use cross-module internal packages. - otel-internal: - files: - - "**/sdk/*.go" - - "**/sdk/**/*.go" - - "**/exporters/*.go" - - "**/exporters/**/*.go" - - "**/schema/*.go" - - "**/schema/**/*.go" - - "**/metric/*.go" - - "**/metric/**/*.go" - - "**/bridge/*.go" - - "**/bridge/**/*.go" - - "**/trace/*.go" - - "**/trace/**/*.go" - - "**/log/*.go" - - "**/log/**/*.go" - deny: - - pkg: "go.opentelemetry.io/otel/internal$" - desc: Do not use cross-module internal packages. - - pkg: "go.opentelemetry.io/otel/internal/attribute" - desc: Do not use cross-module internal packages. - - pkg: "go.opentelemetry.io/otel/internal/internaltest" - desc: Do not use cross-module internal packages. - - pkg: "go.opentelemetry.io/otel/internal/matchers" - desc: Do not use cross-module internal packages. - godot: - exclude: - # Exclude links. - - '^ *\[[^]]+\]:' - # Exclude sentence fragments for lists. - - '^[ ]*[-•]' - # Exclude sentences prefixing a list. - - ':$' - goimports: - local-prefixes: go.opentelemetry.io - misspell: - locale: US - ignore-words: - - cancelled - perfsprint: - err-error: true - errorf: true - int-conversion: true - sprintf1: true - strconcat: true - revive: - # Sets the default failure confidence. - # This means that linting errors with less than 0.8 confidence will be ignored. - # Default: 0.8 - confidence: 0.01 - # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md - rules: - - name: blank-imports - - name: bool-literal-in-expr - - name: constant-logical-expr - - name: context-as-argument - disabled: true - arguments: - - allowTypesBefore: "*testing.T" - - name: context-keys-type - - name: deep-exit - - name: defer - arguments: - - ["call-chain", "loop"] - - name: dot-imports - - name: duplicated-imports - - name: early-return - arguments: - - "preserveScope" - - name: empty-block - - name: empty-lines - - name: error-naming - - name: error-return - - name: error-strings - - name: errorf - - name: exported - arguments: - - "sayRepetitiveInsteadOfStutters" - - name: flag-parameter - - name: identical-branches - - name: if-return - - name: import-shadowing - - name: increment-decrement - - name: indent-error-flow - arguments: - - "preserveScope" - - name: package-comments - - name: range - - name: range-val-in-closure - - name: range-val-address - - name: redefines-builtin-id - - name: string-format - arguments: - - - panic - - '/^[^\n]*$/' - - must not contain line breaks - - name: struct-tag - - name: superfluous-else - arguments: - - "preserveScope" - - name: time-equal - - name: unconditional-recursion - - name: unexported-return - - name: unhandled-error - arguments: - - "fmt.Fprint" - - "fmt.Fprintf" - - "fmt.Fprintln" - - "fmt.Print" - - "fmt.Printf" - - "fmt.Println" - - name: unnecessary-stmt - - name: useless-break - - name: var-declaration - - name: var-naming - arguments: - - ["ID"] # AllowList - - ["Otel", "Aws", "Gcp"] # DenyList - - name: waitgroup-by-value - testifylint: - enable-all: true - disable: - - float-compare - - go-require - - require-error +formatters: + enable: + - gofumpt + - goimports + - golines + settings: + goimports: + local-prefixes: + - go.opentelemetry.io + golines: + max-len: 120 + exclusions: + generated: lax + paths: + - third_party$ + - builtin$ + - examples$ diff --git a/vendor/go.opentelemetry.io/otel/CHANGELOG.md b/vendor/go.opentelemetry.io/otel/CHANGELOG.md index c076db28..648e4aba 100644 --- a/vendor/go.opentelemetry.io/otel/CHANGELOG.md +++ b/vendor/go.opentelemetry.io/otel/CHANGELOG.md @@ -11,6 +11,57 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm +## [1.36.0/0.58.0/0.12.0] 2025-05-20 + +### Added + +- Add exponential histogram support in `go.opentelemetry.io/otel/exporters/prometheus`. (#6421) +- The `go.opentelemetry.io/otel/semconv/v1.31.0` package. + The package contains semantic conventions from the `v1.31.0` version of the OpenTelemetry Semantic Conventions. + See the [migration documentation](./semconv/v1.31.0/MIGRATION.md) for information on how to upgrade from `go.opentelemetry.io/otel/semconv/v1.30.0`. (#6479) +- Add `Recording`, `Scope`, and `Record` types in `go.opentelemetry.io/otel/log/logtest`. (#6507) +- Add `WithHTTPClient` option to configure the `http.Client` used by `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp`. (#6751) +- Add `WithHTTPClient` option to configure the `http.Client` used by `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp`. (#6752) +- Add `WithHTTPClient` option to configure the `http.Client` used by `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`. (#6688) +- Add `ValuesGetter` in `go.opentelemetry.io/otel/propagation`, a `TextMapCarrier` that supports retrieving multiple values for a single key. (#5973) +- Add `Values` method to `HeaderCarrier` to implement the new `ValuesGetter` interface in `go.opentelemetry.io/otel/propagation`. (#5973) +- Update `Baggage` in `go.opentelemetry.io/otel/propagation` to retrieve multiple values for a key when the carrier implements `ValuesGetter`. (#5973) +- Add `AssertEqual` function in `go.opentelemetry.io/otel/log/logtest`. (#6662) +- The `go.opentelemetry.io/otel/semconv/v1.32.0` package. + The package contains semantic conventions from the `v1.32.0` version of the OpenTelemetry Semantic Conventions. + See the [migration documentation](./semconv/v1.32.0/MIGRATION.md) for information on how to upgrade from `go.opentelemetry.io/otel/semconv/v1.31.0`(#6782) +- Add `Transform` option in `go.opentelemetry.io/otel/log/logtest`. (#6794) +- Add `Desc` option in `go.opentelemetry.io/otel/log/logtest`. (#6796) + +### Removed + +- Drop support for [Go 1.22]. (#6381, #6418) +- Remove `Resource` field from `EnabledParameters` in `go.opentelemetry.io/otel/sdk/log`. (#6494) +- Remove `RecordFactory` type from `go.opentelemetry.io/otel/log/logtest`. (#6492) +- Remove `ScopeRecords`, `EmittedRecord`, and `RecordFactory` types from `go.opentelemetry.io/otel/log/logtest`. (#6507) +- Remove `AssertRecordEqual` function in `go.opentelemetry.io/otel/log/logtest`, use `AssertEqual` instead. (#6662) + +### Changed + +- ⚠️ Update `github.com/prometheus/client_golang` to `v1.21.1`, which changes the `NameValidationScheme` to `UTF8Validation`. + This allows metrics names to keep original delimiters (e.g. `.`), rather than replacing with underscores. + This can be reverted by setting `github.com/prometheus/common/model.NameValidationScheme` to `LegacyValidation` in `github.com/prometheus/common/model`. (#6433) +- Initialize map with `len(keys)` in `NewAllowKeysFilter` and `NewDenyKeysFilter` to avoid unnecessary allocations in `go.opentelemetry.io/otel/attribute`. (#6455) +- `go.opentelemetry.io/otel/log/logtest` is now a separate Go module. (#6465) +- `go.opentelemetry.io/otel/sdk/log/logtest` is now a separate Go module. (#6466) +- `Recorder` in `go.opentelemetry.io/otel/log/logtest` no longer separately stores records emitted by loggers with the same instrumentation scope. (#6507) +- Improve performance of `BatchProcessor` in `go.opentelemetry.io/otel/sdk/log` by not exporting when exporter cannot accept more. (#6569, #6641) + +### Deprecated + +- Deprecate support for `model.LegacyValidation` for `go.opentelemetry.io/otel/exporters/prometheus`. (#6449) + +### Fixes + +- Stop percent encoding header environment variables in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc` and `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`. (#6392) +- Ensure the `noopSpan.tracerProvider` method is not inlined in `go.opentelemetry.io/otel/trace` so the `go.opentelemetry.io/auto` instrumentation can instrument non-recording spans. (#6456) +- Use a `sync.Pool` instead of allocating `metricdata.ResourceMetrics` in `go.opentelemetry.io/otel/exporters/prometheus`. (#6472) + ## [1.35.0/0.57.0/0.11.0] 2025-03-05 This release is the last to support [Go 1.22]. @@ -3237,7 +3288,8 @@ It contains api and sdk for trace and meter. - CircleCI build CI manifest files. - CODEOWNERS file to track owners of this project. -[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.35.0...HEAD +[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.36.0...HEAD +[1.36.0/0.58.0/0.12.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.36.0 [1.35.0/0.57.0/0.11.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.35.0 [1.34.0/0.56.0/0.10.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.34.0 [1.33.0/0.55.0/0.9.0/0.0.12]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.33.0 diff --git a/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md b/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md index 7b8af585..1902dac0 100644 --- a/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md +++ b/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md @@ -643,6 +643,7 @@ should be canceled. ### Triagers +- [Alex Kats](https://github.com/akats7), Capital One - [Cheng-Zhen Yang](https://github.com/scorpionknifes), Independent ### Approvers diff --git a/vendor/go.opentelemetry.io/otel/Makefile b/vendor/go.opentelemetry.io/otel/Makefile index 226410d7..62a56f4d 100644 --- a/vendor/go.opentelemetry.io/otel/Makefile +++ b/vendor/go.opentelemetry.io/otel/Makefile @@ -43,8 +43,11 @@ $(TOOLS)/crosslink: PACKAGE=go.opentelemetry.io/build-tools/crosslink SEMCONVKIT = $(TOOLS)/semconvkit $(TOOLS)/semconvkit: PACKAGE=go.opentelemetry.io/otel/$(TOOLS_MOD_DIR)/semconvkit +VERIFYREADMES = $(TOOLS)/verifyreadmes +$(TOOLS)/verifyreadmes: PACKAGE=go.opentelemetry.io/otel/$(TOOLS_MOD_DIR)/verifyreadmes + GOLANGCI_LINT = $(TOOLS)/golangci-lint -$(TOOLS)/golangci-lint: PACKAGE=github.com/golangci/golangci-lint/cmd/golangci-lint +$(TOOLS)/golangci-lint: PACKAGE=github.com/golangci/golangci-lint/v2/cmd/golangci-lint MISSPELL = $(TOOLS)/misspell $(TOOLS)/misspell: PACKAGE=github.com/client9/misspell/cmd/misspell @@ -68,7 +71,7 @@ GOVULNCHECK = $(TOOLS)/govulncheck $(TOOLS)/govulncheck: PACKAGE=golang.org/x/vuln/cmd/govulncheck .PHONY: tools -tools: $(CROSSLINK) $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(SEMCONVGEN) $(MULTIMOD) $(SEMCONVKIT) $(GOTMPL) $(GORELEASE) +tools: $(CROSSLINK) $(GOLANGCI_LINT) $(MISSPELL) $(GOCOVMERGE) $(STRINGER) $(PORTO) $(SEMCONVGEN) $(VERIFYREADMES) $(MULTIMOD) $(SEMCONVKIT) $(GOTMPL) $(GORELEASE) # Virtualized python tools via docker @@ -213,11 +216,8 @@ go-mod-tidy/%: crosslink && cd $(DIR) \ && $(GO) mod tidy -compat=1.21 -.PHONY: lint-modules -lint-modules: go-mod-tidy - .PHONY: lint -lint: misspell lint-modules golangci-lint govulncheck +lint: misspell go-mod-tidy golangci-lint govulncheck .PHONY: vanity-import-check vanity-import-check: $(PORTO) @@ -319,10 +319,11 @@ add-tags: verify-mods @[ "${MODSET}" ] || ( echo ">> env var MODSET is not set"; exit 1 ) $(MULTIMOD) tag -m ${MODSET} -c ${COMMIT} +MARKDOWNIMAGE := $(shell awk '$$4=="markdown" {print $$2}' $(DEPENDENCIES_DOCKERFILE)) .PHONY: lint-markdown lint-markdown: - docker run -v "$(CURDIR):$(WORKDIR)" avtodev/markdown-lint:v1 -c $(WORKDIR)/.markdownlint.yaml $(WORKDIR)/**/*.md + docker run --rm -u $(DOCKER_USER) -v "$(CURDIR):$(WORKDIR)" $(MARKDOWNIMAGE) -c $(WORKDIR)/.markdownlint.yaml $(WORKDIR)/**/*.md .PHONY: verify-readmes -verify-readmes: - ./verify_readmes.sh +verify-readmes: $(VERIFYREADMES) + $(VERIFYREADMES) diff --git a/vendor/go.opentelemetry.io/otel/README.md b/vendor/go.opentelemetry.io/otel/README.md index 8421cd7e..b6007881 100644 --- a/vendor/go.opentelemetry.io/otel/README.md +++ b/vendor/go.opentelemetry.io/otel/README.md @@ -6,6 +6,7 @@ [![Go Report Card](https://goreportcard.com/badge/go.opentelemetry.io/otel)](https://goreportcard.com/report/go.opentelemetry.io/otel) [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/open-telemetry/opentelemetry-go/badge)](https://scorecard.dev/viewer/?uri=github.com/open-telemetry/opentelemetry-go) [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9996/badge)](https://www.bestpractices.dev/projects/9996) +[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/opentelemetry-go.svg)](https://issues.oss-fuzz.com/issues?q=project:opentelemetry-go) [![Slack](https://img.shields.io/badge/slack-@cncf/otel--go-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C01NPAXACKT) OpenTelemetry-Go is the [Go](https://golang.org/) implementation of [OpenTelemetry](https://opentelemetry.io/). @@ -53,25 +54,18 @@ Currently, this project supports the following environments. |----------|------------|--------------| | Ubuntu | 1.24 | amd64 | | Ubuntu | 1.23 | amd64 | -| Ubuntu | 1.22 | amd64 | | Ubuntu | 1.24 | 386 | | Ubuntu | 1.23 | 386 | -| Ubuntu | 1.22 | 386 | | Ubuntu | 1.24 | arm64 | | Ubuntu | 1.23 | arm64 | -| Ubuntu | 1.22 | arm64 | | macOS 13 | 1.24 | amd64 | | macOS 13 | 1.23 | amd64 | -| macOS 13 | 1.22 | amd64 | | macOS | 1.24 | arm64 | | macOS | 1.23 | arm64 | -| macOS | 1.22 | arm64 | | Windows | 1.24 | amd64 | | Windows | 1.23 | amd64 | -| Windows | 1.22 | amd64 | | Windows | 1.24 | 386 | | Windows | 1.23 | 386 | -| Windows | 1.22 | 386 | While this project should work for other systems, no compatibility guarantees are made for those systems currently. diff --git a/vendor/go.opentelemetry.io/otel/RELEASING.md b/vendor/go.opentelemetry.io/otel/RELEASING.md index 1e13ae54..7c1a9119 100644 --- a/vendor/go.opentelemetry.io/otel/RELEASING.md +++ b/vendor/go.opentelemetry.io/otel/RELEASING.md @@ -1,5 +1,9 @@ # Release Process +## Create a `Version Release` issue + +Create a `Version Release` issue to track the release process. + ## Semantic Convention Generation New versions of the [OpenTelemetry Semantic Conventions] mean new versions of the `semconv` package need to be generated. @@ -123,6 +127,16 @@ Importantly, bump any package versions referenced to be the latest one you just [Go instrumentation documentation]: https://opentelemetry.io/docs/languages/go/ [content/en/docs/languages/go]: https://github.com/open-telemetry/opentelemetry.io/tree/main/content/en/docs/languages/go +### Close the milestone + +Once a release is made, ensure all issues that were fixed and PRs that were merged as part of this release are added to the corresponding milestone. +This helps track what changes were included in each release. + +- To find issues that haven't been included in a milestone, use this [GitHub search query](https://github.com/open-telemetry/opentelemetry-go/issues?q=is%3Aissue%20no%3Amilestone%20is%3Aclosed%20sort%3Aupdated-desc%20reason%3Acompleted%20-label%3AStale%20linked%3Apr) +- To find merged PRs that haven't been included in a milestone, use this [GitHub search query](https://github.com/open-telemetry/opentelemetry-go/pulls?q=is%3Apr+no%3Amilestone+is%3Amerged). + +Once all related issues and PRs have been added to the milestone, close the milestone. + ### Demo Repository Bump the dependencies in the following Go services: @@ -130,3 +144,7 @@ Bump the dependencies in the following Go services: - [`accounting`](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/accounting) - [`checkoutservice`](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/checkout) - [`productcatalogservice`](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/product-catalog) + +### Close the `Version Release` issue + +Once the todo list in the `Version Release` issue is complete, close the issue. diff --git a/vendor/go.opentelemetry.io/otel/attribute/filter.go b/vendor/go.opentelemetry.io/otel/attribute/filter.go index be9cd922..3eeaa5d4 100644 --- a/vendor/go.opentelemetry.io/otel/attribute/filter.go +++ b/vendor/go.opentelemetry.io/otel/attribute/filter.go @@ -19,7 +19,7 @@ func NewAllowKeysFilter(keys ...Key) Filter { return func(kv KeyValue) bool { return false } } - allowed := make(map[Key]struct{}) + allowed := make(map[Key]struct{}, len(keys)) for _, k := range keys { allowed[k] = struct{}{} } @@ -38,7 +38,7 @@ func NewDenyKeysFilter(keys ...Key) Filter { return func(kv KeyValue) bool { return true } } - forbid := make(map[Key]struct{}) + forbid := make(map[Key]struct{}, len(keys)) for _, k := range keys { forbid[k] = struct{}{} } diff --git a/vendor/go.opentelemetry.io/otel/internal/attribute/attribute.go b/vendor/go.opentelemetry.io/otel/attribute/internal/attribute.go similarity index 97% rename from vendor/go.opentelemetry.io/otel/internal/attribute/attribute.go rename to vendor/go.opentelemetry.io/otel/attribute/internal/attribute.go index 691d96c7..b76d2bbf 100644 --- a/vendor/go.opentelemetry.io/otel/internal/attribute/attribute.go +++ b/vendor/go.opentelemetry.io/otel/attribute/internal/attribute.go @@ -5,7 +5,7 @@ Package attribute provide several helper functions for some commonly used logic of processing attributes. */ -package attribute // import "go.opentelemetry.io/otel/internal/attribute" +package attribute // import "go.opentelemetry.io/otel/attribute/internal" import ( "reflect" diff --git a/vendor/go.opentelemetry.io/otel/attribute/rawhelpers.go b/vendor/go.opentelemetry.io/otel/attribute/rawhelpers.go new file mode 100644 index 00000000..5791c6e7 --- /dev/null +++ b/vendor/go.opentelemetry.io/otel/attribute/rawhelpers.go @@ -0,0 +1,37 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package attribute // import "go.opentelemetry.io/otel/attribute" + +import ( + "math" +) + +func boolToRaw(b bool) uint64 { // nolint:revive // b is not a control flag. + if b { + return 1 + } + return 0 +} + +func rawToBool(r uint64) bool { + return r != 0 +} + +func int64ToRaw(i int64) uint64 { + // Assumes original was a valid int64 (overflow not checked). + return uint64(i) // nolint: gosec +} + +func rawToInt64(r uint64) int64 { + // Assumes original was a valid int64 (overflow not checked). + return int64(r) // nolint: gosec +} + +func float64ToRaw(f float64) uint64 { + return math.Float64bits(f) +} + +func rawToFloat64(r uint64) float64 { + return math.Float64frombits(r) +} diff --git a/vendor/go.opentelemetry.io/otel/attribute/value.go b/vendor/go.opentelemetry.io/otel/attribute/value.go index 9ea0ecbb..817eecac 100644 --- a/vendor/go.opentelemetry.io/otel/attribute/value.go +++ b/vendor/go.opentelemetry.io/otel/attribute/value.go @@ -9,8 +9,7 @@ import ( "reflect" "strconv" - "go.opentelemetry.io/otel/internal" - "go.opentelemetry.io/otel/internal/attribute" + attribute "go.opentelemetry.io/otel/attribute/internal" ) //go:generate stringer -type=Type @@ -51,7 +50,7 @@ const ( func BoolValue(v bool) Value { return Value{ vtype: BOOL, - numeric: internal.BoolToRaw(v), + numeric: boolToRaw(v), } } @@ -82,7 +81,7 @@ func IntSliceValue(v []int) Value { func Int64Value(v int64) Value { return Value{ vtype: INT64, - numeric: internal.Int64ToRaw(v), + numeric: int64ToRaw(v), } } @@ -95,7 +94,7 @@ func Int64SliceValue(v []int64) Value { func Float64Value(v float64) Value { return Value{ vtype: FLOAT64, - numeric: internal.Float64ToRaw(v), + numeric: float64ToRaw(v), } } @@ -125,7 +124,7 @@ func (v Value) Type() Type { // AsBool returns the bool value. Make sure that the Value's type is // BOOL. func (v Value) AsBool() bool { - return internal.RawToBool(v.numeric) + return rawToBool(v.numeric) } // AsBoolSlice returns the []bool value. Make sure that the Value's type is @@ -144,7 +143,7 @@ func (v Value) asBoolSlice() []bool { // AsInt64 returns the int64 value. Make sure that the Value's type is // INT64. func (v Value) AsInt64() int64 { - return internal.RawToInt64(v.numeric) + return rawToInt64(v.numeric) } // AsInt64Slice returns the []int64 value. Make sure that the Value's type is @@ -163,7 +162,7 @@ func (v Value) asInt64Slice() []int64 { // AsFloat64 returns the float64 value. Make sure that the Value's // type is FLOAT64. func (v Value) AsFloat64() float64 { - return internal.RawToFloat64(v.numeric) + return rawToFloat64(v.numeric) } // AsFloat64Slice returns the []float64 value. Make sure that the Value's type is diff --git a/vendor/go.opentelemetry.io/otel/dependencies.Dockerfile b/vendor/go.opentelemetry.io/otel/dependencies.Dockerfile index e4c4a753..51fb76b3 100644 --- a/vendor/go.opentelemetry.io/otel/dependencies.Dockerfile +++ b/vendor/go.opentelemetry.io/otel/dependencies.Dockerfile @@ -1,3 +1,4 @@ # This is a renovate-friendly source of Docker images. -FROM python:3.13.2-slim-bullseye@sha256:31b581c8218e1f3c58672481b3b7dba8e898852866b408c6a984c22832523935 AS python -FROM otel/weaver:v0.13.2@sha256:ae7346b992e477f629ea327e0979e8a416a97f7956ab1f7e95ac1f44edf1a893 AS weaver +FROM python:3.13.3-slim-bullseye@sha256:9e3f9243e06fd68eb9519074b49878eda20ad39a855fac51aaffb741de20726e AS python +FROM otel/weaver:v0.15.0@sha256:1cf1c72eaed57dad813c2e359133b8a15bd4facf305aae5b13bdca6d3eccff56 AS weaver +FROM avtodev/markdown-lint:v1@sha256:6aeedc2f49138ce7a1cd0adffc1b1c0321b841dc2102408967d9301c031949ee AS markdown diff --git a/vendor/go.opentelemetry.io/otel/get_main_pkgs.sh b/vendor/go.opentelemetry.io/otel/get_main_pkgs.sh deleted file mode 100644 index 93e80ea3..00000000 --- a/vendor/go.opentelemetry.io/otel/get_main_pkgs.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -# Copyright The OpenTelemetry Authors -# SPDX-License-Identifier: Apache-2.0 - -set -euo pipefail - -top_dir='.' -if [[ $# -gt 0 ]]; then - top_dir="${1}" -fi - -p=$(pwd) -mod_dirs=() - -# Note `mapfile` does not exist in older bash versions: -# https://stackoverflow.com/questions/41475261/need-alternative-to-readarray-mapfile-for-script-on-older-version-of-bash - -while IFS= read -r line; do - mod_dirs+=("$line") -done < <(find "${top_dir}" -type f -name 'go.mod' -exec dirname {} \; | sort) - -for mod_dir in "${mod_dirs[@]}"; do - cd "${mod_dir}" - - while IFS= read -r line; do - echo ".${line#${p}}" - done < <(go list --find -f '{{.Name}}|{{.Dir}}' ./... | grep '^main|' | cut -f 2- -d '|') - cd "${p}" -done diff --git a/vendor/go.opentelemetry.io/otel/internal/gen.go b/vendor/go.opentelemetry.io/otel/internal/gen.go deleted file mode 100644 index 4259f032..00000000 --- a/vendor/go.opentelemetry.io/otel/internal/gen.go +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package internal // import "go.opentelemetry.io/otel/internal" - -//go:generate gotmpl --body=./shared/matchers/expectation.go.tmpl "--data={}" --out=matchers/expectation.go -//go:generate gotmpl --body=./shared/matchers/expecter.go.tmpl "--data={}" --out=matchers/expecter.go -//go:generate gotmpl --body=./shared/matchers/temporal_matcher.go.tmpl "--data={}" --out=matchers/temporal_matcher.go - -//go:generate gotmpl --body=./shared/internaltest/alignment.go.tmpl "--data={}" --out=internaltest/alignment.go -//go:generate gotmpl --body=./shared/internaltest/env.go.tmpl "--data={}" --out=internaltest/env.go -//go:generate gotmpl --body=./shared/internaltest/env_test.go.tmpl "--data={}" --out=internaltest/env_test.go -//go:generate gotmpl --body=./shared/internaltest/errors.go.tmpl "--data={}" --out=internaltest/errors.go -//go:generate gotmpl --body=./shared/internaltest/harness.go.tmpl "--data={\"matchersImportPath\": \"go.opentelemetry.io/otel/internal/matchers\"}" --out=internaltest/harness.go -//go:generate gotmpl --body=./shared/internaltest/text_map_carrier.go.tmpl "--data={}" --out=internaltest/text_map_carrier.go -//go:generate gotmpl --body=./shared/internaltest/text_map_carrier_test.go.tmpl "--data={}" --out=internaltest/text_map_carrier_test.go -//go:generate gotmpl --body=./shared/internaltest/text_map_propagator.go.tmpl "--data={}" --out=internaltest/text_map_propagator.go -//go:generate gotmpl --body=./shared/internaltest/text_map_propagator_test.go.tmpl "--data={}" --out=internaltest/text_map_propagator_test.go diff --git a/vendor/go.opentelemetry.io/otel/internal/global/handler.go b/vendor/go.opentelemetry.io/otel/internal/global/handler.go index c657ff8e..2e47b296 100644 --- a/vendor/go.opentelemetry.io/otel/internal/global/handler.go +++ b/vendor/go.opentelemetry.io/otel/internal/global/handler.go @@ -1,6 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 +// Package global provides the OpenTelemetry global API. package global // import "go.opentelemetry.io/otel/internal/global" import ( diff --git a/vendor/go.opentelemetry.io/otel/internal/global/meter.go b/vendor/go.opentelemetry.io/otel/internal/global/meter.go index a6acd8dc..adb37b5b 100644 --- a/vendor/go.opentelemetry.io/otel/internal/global/meter.go +++ b/vendor/go.opentelemetry.io/otel/internal/global/meter.go @@ -169,7 +169,10 @@ func (m *meter) Int64Counter(name string, options ...metric.Int64CounterOption) return i, nil } -func (m *meter) Int64UpDownCounter(name string, options ...metric.Int64UpDownCounterOption) (metric.Int64UpDownCounter, error) { +func (m *meter) Int64UpDownCounter( + name string, + options ...metric.Int64UpDownCounterOption, +) (metric.Int64UpDownCounter, error) { m.mtx.Lock() defer m.mtx.Unlock() @@ -238,7 +241,10 @@ func (m *meter) Int64Gauge(name string, options ...metric.Int64GaugeOption) (met return i, nil } -func (m *meter) Int64ObservableCounter(name string, options ...metric.Int64ObservableCounterOption) (metric.Int64ObservableCounter, error) { +func (m *meter) Int64ObservableCounter( + name string, + options ...metric.Int64ObservableCounterOption, +) (metric.Int64ObservableCounter, error) { m.mtx.Lock() defer m.mtx.Unlock() @@ -261,7 +267,10 @@ func (m *meter) Int64ObservableCounter(name string, options ...metric.Int64Obser return i, nil } -func (m *meter) Int64ObservableUpDownCounter(name string, options ...metric.Int64ObservableUpDownCounterOption) (metric.Int64ObservableUpDownCounter, error) { +func (m *meter) Int64ObservableUpDownCounter( + name string, + options ...metric.Int64ObservableUpDownCounterOption, +) (metric.Int64ObservableUpDownCounter, error) { m.mtx.Lock() defer m.mtx.Unlock() @@ -284,7 +293,10 @@ func (m *meter) Int64ObservableUpDownCounter(name string, options ...metric.Int6 return i, nil } -func (m *meter) Int64ObservableGauge(name string, options ...metric.Int64ObservableGaugeOption) (metric.Int64ObservableGauge, error) { +func (m *meter) Int64ObservableGauge( + name string, + options ...metric.Int64ObservableGaugeOption, +) (metric.Int64ObservableGauge, error) { m.mtx.Lock() defer m.mtx.Unlock() @@ -330,7 +342,10 @@ func (m *meter) Float64Counter(name string, options ...metric.Float64CounterOpti return i, nil } -func (m *meter) Float64UpDownCounter(name string, options ...metric.Float64UpDownCounterOption) (metric.Float64UpDownCounter, error) { +func (m *meter) Float64UpDownCounter( + name string, + options ...metric.Float64UpDownCounterOption, +) (metric.Float64UpDownCounter, error) { m.mtx.Lock() defer m.mtx.Unlock() @@ -353,7 +368,10 @@ func (m *meter) Float64UpDownCounter(name string, options ...metric.Float64UpDow return i, nil } -func (m *meter) Float64Histogram(name string, options ...metric.Float64HistogramOption) (metric.Float64Histogram, error) { +func (m *meter) Float64Histogram( + name string, + options ...metric.Float64HistogramOption, +) (metric.Float64Histogram, error) { m.mtx.Lock() defer m.mtx.Unlock() @@ -399,7 +417,10 @@ func (m *meter) Float64Gauge(name string, options ...metric.Float64GaugeOption) return i, nil } -func (m *meter) Float64ObservableCounter(name string, options ...metric.Float64ObservableCounterOption) (metric.Float64ObservableCounter, error) { +func (m *meter) Float64ObservableCounter( + name string, + options ...metric.Float64ObservableCounterOption, +) (metric.Float64ObservableCounter, error) { m.mtx.Lock() defer m.mtx.Unlock() @@ -422,7 +443,10 @@ func (m *meter) Float64ObservableCounter(name string, options ...metric.Float64O return i, nil } -func (m *meter) Float64ObservableUpDownCounter(name string, options ...metric.Float64ObservableUpDownCounterOption) (metric.Float64ObservableUpDownCounter, error) { +func (m *meter) Float64ObservableUpDownCounter( + name string, + options ...metric.Float64ObservableUpDownCounterOption, +) (metric.Float64ObservableUpDownCounter, error) { m.mtx.Lock() defer m.mtx.Unlock() @@ -445,7 +469,10 @@ func (m *meter) Float64ObservableUpDownCounter(name string, options ...metric.Fl return i, nil } -func (m *meter) Float64ObservableGauge(name string, options ...metric.Float64ObservableGaugeOption) (metric.Float64ObservableGauge, error) { +func (m *meter) Float64ObservableGauge( + name string, + options ...metric.Float64ObservableGaugeOption, +) (metric.Float64ObservableGauge, error) { m.mtx.Lock() defer m.mtx.Unlock() diff --git a/vendor/go.opentelemetry.io/otel/internal/global/trace.go b/vendor/go.opentelemetry.io/otel/internal/global/trace.go index 8982aa0d..49e4ac4f 100644 --- a/vendor/go.opentelemetry.io/otel/internal/global/trace.go +++ b/vendor/go.opentelemetry.io/otel/internal/global/trace.go @@ -158,7 +158,18 @@ func (t *tracer) Start(ctx context.Context, name string, opts ...trace.SpanStart // a nonRecordingSpan by default. var autoInstEnabled = new(bool) -func (t *tracer) newSpan(ctx context.Context, autoSpan *bool, name string, opts []trace.SpanStartOption) (context.Context, trace.Span) { +// newSpan is called by tracer.Start so auto-instrumentation can attach an eBPF +// uprobe to this code. +// +// "noinline" pragma prevents the method from ever being inlined. +// +//go:noinline +func (t *tracer) newSpan( + ctx context.Context, + autoSpan *bool, + name string, + opts []trace.SpanStartOption, +) (context.Context, trace.Span) { // autoInstEnabled is passed to newSpan via the autoSpan parameter. This is // so the auto-instrumentation can define a uprobe for (*t).newSpan and be // provided with the address of the bool autoInstEnabled points to. It diff --git a/vendor/go.opentelemetry.io/otel/internal/rawhelpers.go b/vendor/go.opentelemetry.io/otel/internal/rawhelpers.go deleted file mode 100644 index b2fe3e41..00000000 --- a/vendor/go.opentelemetry.io/otel/internal/rawhelpers.go +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package internal // import "go.opentelemetry.io/otel/internal" - -import ( - "math" - "unsafe" -) - -func BoolToRaw(b bool) uint64 { // nolint:revive // b is not a control flag. - if b { - return 1 - } - return 0 -} - -func RawToBool(r uint64) bool { - return r != 0 -} - -func Int64ToRaw(i int64) uint64 { - // Assumes original was a valid int64 (overflow not checked). - return uint64(i) // nolint: gosec -} - -func RawToInt64(r uint64) int64 { - // Assumes original was a valid int64 (overflow not checked). - return int64(r) // nolint: gosec -} - -func Float64ToRaw(f float64) uint64 { - return math.Float64bits(f) -} - -func RawToFloat64(r uint64) float64 { - return math.Float64frombits(r) -} - -func RawPtrToFloat64Ptr(r *uint64) *float64 { - // Assumes original was a valid *float64 (overflow not checked). - return (*float64)(unsafe.Pointer(r)) // nolint: gosec -} - -func RawPtrToInt64Ptr(r *uint64) *int64 { - // Assumes original was a valid *int64 (overflow not checked). - return (*int64)(unsafe.Pointer(r)) // nolint: gosec -} diff --git a/vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go b/vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go index f8435d8f..b7fc973a 100644 --- a/vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go +++ b/vendor/go.opentelemetry.io/otel/metric/asyncfloat64.go @@ -106,7 +106,9 @@ type Float64ObservableUpDownCounterConfig struct { // NewFloat64ObservableUpDownCounterConfig returns a new // [Float64ObservableUpDownCounterConfig] with all opts applied. -func NewFloat64ObservableUpDownCounterConfig(opts ...Float64ObservableUpDownCounterOption) Float64ObservableUpDownCounterConfig { +func NewFloat64ObservableUpDownCounterConfig( + opts ...Float64ObservableUpDownCounterOption, +) Float64ObservableUpDownCounterConfig { var config Float64ObservableUpDownCounterConfig for _, o := range opts { config = o.applyFloat64ObservableUpDownCounter(config) @@ -239,12 +241,16 @@ type float64CallbackOpt struct { cback Float64Callback } -func (o float64CallbackOpt) applyFloat64ObservableCounter(cfg Float64ObservableCounterConfig) Float64ObservableCounterConfig { +func (o float64CallbackOpt) applyFloat64ObservableCounter( + cfg Float64ObservableCounterConfig, +) Float64ObservableCounterConfig { cfg.callbacks = append(cfg.callbacks, o.cback) return cfg } -func (o float64CallbackOpt) applyFloat64ObservableUpDownCounter(cfg Float64ObservableUpDownCounterConfig) Float64ObservableUpDownCounterConfig { +func (o float64CallbackOpt) applyFloat64ObservableUpDownCounter( + cfg Float64ObservableUpDownCounterConfig, +) Float64ObservableUpDownCounterConfig { cfg.callbacks = append(cfg.callbacks, o.cback) return cfg } diff --git a/vendor/go.opentelemetry.io/otel/metric/asyncint64.go b/vendor/go.opentelemetry.io/otel/metric/asyncint64.go index e079aaef..4404b71a 100644 --- a/vendor/go.opentelemetry.io/otel/metric/asyncint64.go +++ b/vendor/go.opentelemetry.io/otel/metric/asyncint64.go @@ -105,7 +105,9 @@ type Int64ObservableUpDownCounterConfig struct { // NewInt64ObservableUpDownCounterConfig returns a new // [Int64ObservableUpDownCounterConfig] with all opts applied. -func NewInt64ObservableUpDownCounterConfig(opts ...Int64ObservableUpDownCounterOption) Int64ObservableUpDownCounterConfig { +func NewInt64ObservableUpDownCounterConfig( + opts ...Int64ObservableUpDownCounterOption, +) Int64ObservableUpDownCounterConfig { var config Int64ObservableUpDownCounterConfig for _, o := range opts { config = o.applyInt64ObservableUpDownCounter(config) @@ -242,7 +244,9 @@ func (o int64CallbackOpt) applyInt64ObservableCounter(cfg Int64ObservableCounter return cfg } -func (o int64CallbackOpt) applyInt64ObservableUpDownCounter(cfg Int64ObservableUpDownCounterConfig) Int64ObservableUpDownCounterConfig { +func (o int64CallbackOpt) applyInt64ObservableUpDownCounter( + cfg Int64ObservableUpDownCounterConfig, +) Int64ObservableUpDownCounterConfig { cfg.callbacks = append(cfg.callbacks, o.cback) return cfg } diff --git a/vendor/go.opentelemetry.io/otel/metric/instrument.go b/vendor/go.opentelemetry.io/otel/metric/instrument.go index a535782e..9f48d5f1 100644 --- a/vendor/go.opentelemetry.io/otel/metric/instrument.go +++ b/vendor/go.opentelemetry.io/otel/metric/instrument.go @@ -63,7 +63,9 @@ func (o descOpt) applyFloat64ObservableCounter(c Float64ObservableCounterConfig) return c } -func (o descOpt) applyFloat64ObservableUpDownCounter(c Float64ObservableUpDownCounterConfig) Float64ObservableUpDownCounterConfig { +func (o descOpt) applyFloat64ObservableUpDownCounter( + c Float64ObservableUpDownCounterConfig, +) Float64ObservableUpDownCounterConfig { c.description = string(o) return c } @@ -98,7 +100,9 @@ func (o descOpt) applyInt64ObservableCounter(c Int64ObservableCounterConfig) Int return c } -func (o descOpt) applyInt64ObservableUpDownCounter(c Int64ObservableUpDownCounterConfig) Int64ObservableUpDownCounterConfig { +func (o descOpt) applyInt64ObservableUpDownCounter( + c Int64ObservableUpDownCounterConfig, +) Int64ObservableUpDownCounterConfig { c.description = string(o) return c } @@ -138,7 +142,9 @@ func (o unitOpt) applyFloat64ObservableCounter(c Float64ObservableCounterConfig) return c } -func (o unitOpt) applyFloat64ObservableUpDownCounter(c Float64ObservableUpDownCounterConfig) Float64ObservableUpDownCounterConfig { +func (o unitOpt) applyFloat64ObservableUpDownCounter( + c Float64ObservableUpDownCounterConfig, +) Float64ObservableUpDownCounterConfig { c.unit = string(o) return c } @@ -173,7 +179,9 @@ func (o unitOpt) applyInt64ObservableCounter(c Int64ObservableCounterConfig) Int return c } -func (o unitOpt) applyInt64ObservableUpDownCounter(c Int64ObservableUpDownCounterConfig) Int64ObservableUpDownCounterConfig { +func (o unitOpt) applyInt64ObservableUpDownCounter( + c Int64ObservableUpDownCounterConfig, +) Int64ObservableUpDownCounterConfig { c.unit = string(o) return c } diff --git a/vendor/go.opentelemetry.io/otel/metric/meter.go b/vendor/go.opentelemetry.io/otel/metric/meter.go index 14e08c24..fdd2a701 100644 --- a/vendor/go.opentelemetry.io/otel/metric/meter.go +++ b/vendor/go.opentelemetry.io/otel/metric/meter.go @@ -110,7 +110,10 @@ type Meter interface { // The name needs to conform to the OpenTelemetry instrument name syntax. // See the Instrument Name section of the package documentation for more // information. - Int64ObservableUpDownCounter(name string, options ...Int64ObservableUpDownCounterOption) (Int64ObservableUpDownCounter, error) + Int64ObservableUpDownCounter( + name string, + options ...Int64ObservableUpDownCounterOption, + ) (Int64ObservableUpDownCounter, error) // Int64ObservableGauge returns a new Int64ObservableGauge instrument // identified by name and configured with options. The instrument is used @@ -194,7 +197,10 @@ type Meter interface { // The name needs to conform to the OpenTelemetry instrument name syntax. // See the Instrument Name section of the package documentation for more // information. - Float64ObservableUpDownCounter(name string, options ...Float64ObservableUpDownCounterOption) (Float64ObservableUpDownCounter, error) + Float64ObservableUpDownCounter( + name string, + options ...Float64ObservableUpDownCounterOption, + ) (Float64ObservableUpDownCounter, error) // Float64ObservableGauge returns a new Float64ObservableGauge instrument // identified by name and configured with options. The instrument is used diff --git a/vendor/go.opentelemetry.io/otel/propagation/baggage.go b/vendor/go.opentelemetry.io/otel/propagation/baggage.go index 552263ba..ebda5026 100644 --- a/vendor/go.opentelemetry.io/otel/propagation/baggage.go +++ b/vendor/go.opentelemetry.io/otel/propagation/baggage.go @@ -28,7 +28,21 @@ func (b Baggage) Inject(ctx context.Context, carrier TextMapCarrier) { } // Extract returns a copy of parent with the baggage from the carrier added. +// If carrier implements [ValuesGetter] (e.g. [HeaderCarrier]), Values is invoked +// for multiple values extraction. Otherwise, Get is called. func (b Baggage) Extract(parent context.Context, carrier TextMapCarrier) context.Context { + if multiCarrier, ok := carrier.(ValuesGetter); ok { + return extractMultiBaggage(parent, multiCarrier) + } + return extractSingleBaggage(parent, carrier) +} + +// Fields returns the keys who's values are set with Inject. +func (b Baggage) Fields() []string { + return []string{baggageHeader} +} + +func extractSingleBaggage(parent context.Context, carrier TextMapCarrier) context.Context { bStr := carrier.Get(baggageHeader) if bStr == "" { return parent @@ -41,7 +55,23 @@ func (b Baggage) Extract(parent context.Context, carrier TextMapCarrier) context return baggage.ContextWithBaggage(parent, bag) } -// Fields returns the keys who's values are set with Inject. -func (b Baggage) Fields() []string { - return []string{baggageHeader} +func extractMultiBaggage(parent context.Context, carrier ValuesGetter) context.Context { + bVals := carrier.Values(baggageHeader) + if len(bVals) == 0 { + return parent + } + var members []baggage.Member + for _, bStr := range bVals { + currBag, err := baggage.Parse(bStr) + if err != nil { + continue + } + members = append(members, currBag.Members()...) + } + + b, err := baggage.New(members...) + if err != nil || b.Len() == 0 { + return parent + } + return baggage.ContextWithBaggage(parent, b) } diff --git a/vendor/go.opentelemetry.io/otel/propagation/propagation.go b/vendor/go.opentelemetry.io/otel/propagation/propagation.go index 8c8286aa..5c8c26ea 100644 --- a/vendor/go.opentelemetry.io/otel/propagation/propagation.go +++ b/vendor/go.opentelemetry.io/otel/propagation/propagation.go @@ -9,6 +9,7 @@ import ( ) // TextMapCarrier is the storage medium used by a TextMapPropagator. +// See ValuesGetter for how a TextMapCarrier can get multiple values for a key. type TextMapCarrier interface { // DO NOT CHANGE: any modification will not be backwards compatible and // must never be done outside of a new major release. @@ -29,6 +30,18 @@ type TextMapCarrier interface { // must never be done outside of a new major release. } +// ValuesGetter can return multiple values for a single key, +// with contrast to TextMapCarrier.Get which returns a single value. +type ValuesGetter interface { + // DO NOT CHANGE: any modification will not be backwards compatible and + // must never be done outside of a new major release. + + // Values returns all values associated with the passed key. + Values(key string) []string + // DO NOT CHANGE: any modification will not be backwards compatible and + // must never be done outside of a new major release. +} + // MapCarrier is a TextMapCarrier that uses a map held in memory as a storage // medium for propagated key-value pairs. type MapCarrier map[string]string @@ -55,14 +68,25 @@ func (c MapCarrier) Keys() []string { return keys } -// HeaderCarrier adapts http.Header to satisfy the TextMapCarrier interface. +// HeaderCarrier adapts http.Header to satisfy the TextMapCarrier and ValuesGetter interfaces. type HeaderCarrier http.Header -// Get returns the value associated with the passed key. +// Compile time check that HeaderCarrier implements ValuesGetter. +var _ TextMapCarrier = HeaderCarrier{} + +// Compile time check that HeaderCarrier implements TextMapCarrier. +var _ ValuesGetter = HeaderCarrier{} + +// Get returns the first value associated with the passed key. func (hc HeaderCarrier) Get(key string) string { return http.Header(hc).Get(key) } +// Values returns all values associated with the passed key. +func (hc HeaderCarrier) Values(key string) []string { + return http.Header(hc).Values(key) +} + // Set stores the key-value pair. func (hc HeaderCarrier) Set(key string, value string) { http.Header(hc).Set(key, value) @@ -89,6 +113,8 @@ type TextMapPropagator interface { // must never be done outside of a new major release. // Extract reads cross-cutting concerns from the carrier into a Context. + // Implementations may check if the carrier implements ValuesGetter, + // to support extraction of multiple values per key. Extract(ctx context.Context, carrier TextMapCarrier) context.Context // DO NOT CHANGE: any modification will not be backwards compatible and // must never be done outside of a new major release. diff --git a/vendor/go.opentelemetry.io/otel/renovate.json b/vendor/go.opentelemetry.io/otel/renovate.json index a6fa353f..fa5acf2d 100644 --- a/vendor/go.opentelemetry.io/otel/renovate.json +++ b/vendor/go.opentelemetry.io/otel/renovate.json @@ -1,7 +1,8 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:best-practices" + "config:best-practices", + "helpers:pinGitHubActionDigestsToSemver" ], "ignorePaths": [], "labels": ["Skip Changelog", "dependencies"], @@ -25,6 +26,10 @@ { "matchPackageNames": ["golang.org/x/**"], "groupName": "golang.org/x" + }, + { + "matchPackageNames": ["go.opentelemetry.io/otel/sdk/log/logtest"], + "enabled": false } ] } diff --git a/vendor/go.opentelemetry.io/otel/semconv/internal/v2/http.go b/vendor/go.opentelemetry.io/otel/semconv/internal/v2/http.go index 09e094de..3709ef09 100644 --- a/vendor/go.opentelemetry.io/otel/semconv/internal/v2/http.go +++ b/vendor/go.opentelemetry.io/otel/semconv/internal/v2/http.go @@ -1,6 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 +// Package internal provides common semconv functionality. package internal // import "go.opentelemetry.io/otel/semconv/internal/v2" import ( diff --git a/vendor/go.opentelemetry.io/otel/trace/auto.go b/vendor/go.opentelemetry.io/otel/trace/auto.go index 7e291002..d90af8f6 100644 --- a/vendor/go.opentelemetry.io/otel/trace/auto.go +++ b/vendor/go.opentelemetry.io/otel/trace/auto.go @@ -57,14 +57,15 @@ type autoTracer struct { var _ Tracer = autoTracer{} func (t autoTracer) Start(ctx context.Context, name string, opts ...SpanStartOption) (context.Context, Span) { - var psc SpanContext + var psc, sc SpanContext sampled := true span := new(autoSpan) // Ask eBPF for sampling decision and span context info. - t.start(ctx, span, &psc, &sampled, &span.spanContext) + t.start(ctx, span, &psc, &sampled, &sc) span.sampled.Store(sampled) + span.spanContext = sc ctx = ContextWithSpan(ctx, span) diff --git a/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/span.go b/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/span.go index 3c5e1cdb..e7ca62c6 100644 --- a/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/span.go +++ b/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/span.go @@ -251,13 +251,20 @@ func (s *Span) UnmarshalJSON(data []byte) error { type SpanFlags int32 const ( + // SpanFlagsTraceFlagsMask is a mask for trace-flags. + // // Bits 0-7 are used for trace flags. SpanFlagsTraceFlagsMask SpanFlags = 255 - // Bits 8 and 9 are used to indicate that the parent span or link span is remote. - // Bit 8 (`HAS_IS_REMOTE`) indicates whether the value is known. - // Bit 9 (`IS_REMOTE`) indicates whether the span or link is remote. + // SpanFlagsContextHasIsRemoteMask is a mask for HAS_IS_REMOTE status. + // + // Bits 8 and 9 are used to indicate that the parent span or link span is + // remote. Bit 8 (`HAS_IS_REMOTE`) indicates whether the value is known. SpanFlagsContextHasIsRemoteMask SpanFlags = 256 - // SpanFlagsContextHasIsRemoteMask indicates the Span is remote. + // SpanFlagsContextIsRemoteMask is a mask for IS_REMOTE status. + // + // Bits 8 and 9 are used to indicate that the parent span or link span is + // remote. Bit 9 (`IS_REMOTE`) indicates whether the span or link is + // remote. SpanFlagsContextIsRemoteMask SpanFlags = 512 ) @@ -266,27 +273,31 @@ const ( type SpanKind int32 const ( - // Indicates that the span represents an internal operation within an application, - // as opposed to an operation happening at the boundaries. Default value. + // SpanKindInternal indicates that the span represents an internal + // operation within an application, as opposed to an operation happening at + // the boundaries. SpanKindInternal SpanKind = 1 - // Indicates that the span covers server-side handling of an RPC or other - // remote network request. + // SpanKindServer indicates that the span covers server-side handling of an + // RPC or other remote network request. SpanKindServer SpanKind = 2 - // Indicates that the span describes a request to some remote service. + // SpanKindClient indicates that the span describes a request to some + // remote service. SpanKindClient SpanKind = 3 - // Indicates that the span describes a producer sending a message to a broker. - // Unlike CLIENT and SERVER, there is often no direct critical path latency relationship - // between producer and consumer spans. A PRODUCER span ends when the message was accepted - // by the broker while the logical processing of the message might span a much longer time. + // SpanKindProducer indicates that the span describes a producer sending a + // message to a broker. Unlike SpanKindClient and SpanKindServer, there is + // often no direct critical path latency relationship between producer and + // consumer spans. A SpanKindProducer span ends when the message was + // accepted by the broker while the logical processing of the message might + // span a much longer time. SpanKindProducer SpanKind = 4 - // Indicates that the span describes consumer receiving a message from a broker. - // Like the PRODUCER kind, there is often no direct critical path latency relationship - // between producer and consumer spans. + // SpanKindConsumer indicates that the span describes a consumer receiving + // a message from a broker. Like SpanKindProducer, there is often no direct + // critical path latency relationship between producer and consumer spans. SpanKindConsumer SpanKind = 5 ) -// Event is a time-stamped annotation of the span, consisting of user-supplied -// text description and key-value pairs. +// SpanEvent is a time-stamped annotation of the span, consisting of +// user-supplied text description and key-value pairs. type SpanEvent struct { // time_unix_nano is the time the event occurred. Time time.Time `json:"timeUnixNano,omitempty"` @@ -369,10 +380,11 @@ func (se *SpanEvent) UnmarshalJSON(data []byte) error { return nil } -// A pointer from the current span to another span in the same trace or in a -// different trace. For example, this can be used in batching operations, -// where a single batch handler processes multiple requests from different -// traces or when the handler receives a request from a different project. +// SpanLink is a reference from the current span to another span in the same +// trace or in a different trace. For example, this can be used in batching +// operations, where a single batch handler processes multiple requests from +// different traces or when the handler receives a request from a different +// project. type SpanLink struct { // A unique identifier of a trace that this linked span is part of. The ID is a // 16-byte array. diff --git a/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/status.go b/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/status.go index 1d013a8f..1039bf40 100644 --- a/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/status.go +++ b/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/status.go @@ -3,17 +3,19 @@ package telemetry // import "go.opentelemetry.io/otel/trace/internal/telemetry" +// StatusCode is the status of a Span. +// // For the semantics of status codes see // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/api.md#set-status type StatusCode int32 const ( - // The default status. + // StatusCodeUnset is the default status. StatusCodeUnset StatusCode = 0 - // The Span has been validated by an Application developer or Operator to - // have completed successfully. + // StatusCodeOK is used when the Span has been validated by an Application + // developer or Operator to have completed successfully. StatusCodeOK StatusCode = 1 - // The Span contains an error. + // StatusCodeError is used when the Span contains an error. StatusCodeError StatusCode = 2 ) @@ -30,7 +32,7 @@ func (s StatusCode) String() string { return "" } -// The Status type defines a logical error model that is suitable for different +// Status defines a logical error model that is suitable for different // programming environments, including REST APIs and RPC APIs. type Status struct { // A developer-facing human readable error message. diff --git a/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/traces.go b/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/traces.go index b0394070..e5f10767 100644 --- a/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/traces.go +++ b/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/traces.go @@ -71,7 +71,7 @@ func (td *Traces) UnmarshalJSON(data []byte) error { return nil } -// A collection of ScopeSpans from a Resource. +// ResourceSpans is a collection of ScopeSpans from a Resource. type ResourceSpans struct { // The resource for the spans in this message. // If this field is not set then no resource info is known. @@ -128,7 +128,7 @@ func (rs *ResourceSpans) UnmarshalJSON(data []byte) error { return nil } -// A collection of Spans produced by an InstrumentationScope. +// ScopeSpans is a collection of Spans produced by an InstrumentationScope. type ScopeSpans struct { // The instrumentation scope information for the spans in this message. // Semantically when InstrumentationScope isn't set, it is equivalent with diff --git a/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/value.go b/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/value.go index 7251492d..ae9ce102 100644 --- a/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/value.go +++ b/vendor/go.opentelemetry.io/otel/trace/internal/telemetry/value.go @@ -316,7 +316,7 @@ func (v Value) String() string { case ValueKindBool: return strconv.FormatBool(v.asBool()) case ValueKindBytes: - return fmt.Sprint(v.asBytes()) + return string(v.asBytes()) case ValueKindMap: return fmt.Sprint(v.asMap()) case ValueKindSlice: diff --git a/vendor/go.opentelemetry.io/otel/trace/noop.go b/vendor/go.opentelemetry.io/otel/trace/noop.go index c8b1ae5d..0f56e4db 100644 --- a/vendor/go.opentelemetry.io/otel/trace/noop.go +++ b/vendor/go.opentelemetry.io/otel/trace/noop.go @@ -95,6 +95,8 @@ var autoInstEnabled = new(bool) // tracerProvider return a noopTracerProvider if autoEnabled is false, // otherwise it will return a TracerProvider from the sdk package used in // auto-instrumentation. +// +//go:noinline func (noopSpan) tracerProvider(autoEnabled *bool) TracerProvider { if *autoEnabled { return newAutoTracerProvider() diff --git a/vendor/go.opentelemetry.io/otel/verify_readmes.sh b/vendor/go.opentelemetry.io/otel/verify_readmes.sh deleted file mode 100644 index 1e87855e..00000000 --- a/vendor/go.opentelemetry.io/otel/verify_readmes.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# Copyright The OpenTelemetry Authors -# SPDX-License-Identifier: Apache-2.0 - -set -euo pipefail - -dirs=$(find . -type d -not -path "*/internal*" -not -path "*/test*" -not -path "*/example*" -not -path "*/.*" | sort) - -missingReadme=false -for dir in $dirs; do - if [ ! -f "$dir/README.md" ]; then - echo "couldn't find README.md for $dir" - missingReadme=true - fi -done - -if [ "$missingReadme" = true ] ; then - echo "Error: some READMEs couldn't be found." - exit 1 -fi diff --git a/vendor/go.opentelemetry.io/otel/version.go b/vendor/go.opentelemetry.io/otel/version.go index d5fa71f6..ac3c0b15 100644 --- a/vendor/go.opentelemetry.io/otel/version.go +++ b/vendor/go.opentelemetry.io/otel/version.go @@ -5,5 +5,5 @@ package otel // import "go.opentelemetry.io/otel" // Version is the current release version of OpenTelemetry in use. func Version() string { - return "1.35.0" + return "1.36.0" } diff --git a/vendor/go.opentelemetry.io/otel/versions.yaml b/vendor/go.opentelemetry.io/otel/versions.yaml index 2b4cb4b4..79f82f3d 100644 --- a/vendor/go.opentelemetry.io/otel/versions.yaml +++ b/vendor/go.opentelemetry.io/otel/versions.yaml @@ -3,7 +3,7 @@ module-sets: stable-v1: - version: v1.35.0 + version: v1.36.0 modules: - go.opentelemetry.io/otel - go.opentelemetry.io/otel/bridge/opencensus @@ -23,11 +23,11 @@ module-sets: - go.opentelemetry.io/otel/sdk/metric - go.opentelemetry.io/otel/trace experimental-metrics: - version: v0.57.0 + version: v0.58.0 modules: - go.opentelemetry.io/otel/exporters/prometheus experimental-logs: - version: v0.11.0 + version: v0.12.0 modules: - go.opentelemetry.io/otel/log - go.opentelemetry.io/otel/sdk/log @@ -40,4 +40,6 @@ module-sets: - go.opentelemetry.io/otel/schema excluded-modules: - go.opentelemetry.io/otel/internal/tools + - go.opentelemetry.io/otel/log/logtest + - go.opentelemetry.io/otel/sdk/log/logtest - go.opentelemetry.io/otel/trace/internal/telemetry/test diff --git a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go index dc931187..3e7f8df8 100644 --- a/vendor/golang.org/x/crypto/bcrypt/bcrypt.go +++ b/vendor/golang.org/x/crypto/bcrypt/bcrypt.go @@ -50,7 +50,7 @@ func (ih InvalidHashPrefixError) Error() string { type InvalidCostError int func (ic InvalidCostError) Error() string { - return fmt.Sprintf("crypto/bcrypt: cost %d is outside allowed range (%d,%d)", int(ic), MinCost, MaxCost) + return fmt.Sprintf("crypto/bcrypt: cost %d is outside allowed inclusive range %d..%d", int(ic), MinCost, MaxCost) } const ( diff --git a/vendor/golang.org/x/mod/semver/semver.go b/vendor/golang.org/x/mod/semver/semver.go index 9a2dfd33..628f8fd6 100644 --- a/vendor/golang.org/x/mod/semver/semver.go +++ b/vendor/golang.org/x/mod/semver/semver.go @@ -22,7 +22,10 @@ // as shorthands for vMAJOR.0.0 and vMAJOR.MINOR.0. package semver -import "sort" +import ( + "slices" + "strings" +) // parsed returns the parsed form of a semantic version string. type parsed struct { @@ -154,19 +157,22 @@ func Max(v, w string) string { // ByVersion implements [sort.Interface] for sorting semantic version strings. type ByVersion []string -func (vs ByVersion) Len() int { return len(vs) } -func (vs ByVersion) Swap(i, j int) { vs[i], vs[j] = vs[j], vs[i] } -func (vs ByVersion) Less(i, j int) bool { - cmp := Compare(vs[i], vs[j]) - if cmp != 0 { - return cmp < 0 - } - return vs[i] < vs[j] +func (vs ByVersion) Len() int { return len(vs) } +func (vs ByVersion) Swap(i, j int) { vs[i], vs[j] = vs[j], vs[i] } +func (vs ByVersion) Less(i, j int) bool { return compareVersion(vs[i], vs[j]) < 0 } + +// Sort sorts a list of semantic version strings using [Compare] and falls back +// to use [strings.Compare] if both versions are considered equal. +func Sort(list []string) { + slices.SortFunc(list, compareVersion) } -// Sort sorts a list of semantic version strings using [ByVersion]. -func Sort(list []string) { - sort.Sort(ByVersion(list)) +func compareVersion(a, b string) int { + cmp := Compare(a, b) + if cmp != 0 { + return cmp + } + return strings.Compare(a, b) } func parse(v string) (p parsed, ok bool) { diff --git a/vendor/golang.org/x/sync/errgroup/errgroup.go b/vendor/golang.org/x/sync/errgroup/errgroup.go index cfafed5b..cb6bb9ad 100644 --- a/vendor/golang.org/x/sync/errgroup/errgroup.go +++ b/vendor/golang.org/x/sync/errgroup/errgroup.go @@ -76,10 +76,8 @@ func (g *Group) Wait() error { } // Go calls the given function in a new goroutine. -// The first call to Go must happen before a Wait. -// It blocks until the new goroutine can be added without the number of -// active goroutines in the group exceeding the configured limit. // +// The first call to Go must happen before a Wait. // It blocks until the new goroutine can be added without the number of // goroutines in the group exceeding the configured limit. // @@ -185,8 +183,9 @@ type PanicError struct { } func (p PanicError) Error() string { - // A Go Error method conventionally does not include a stack dump, so omit it - // here. (Callers who care can extract it from the Stack field.) + if len(p.Stack) > 0 { + return fmt.Sprintf("recovered from errgroup.Group: %v\n%s", p.Recovered, p.Stack) + } return fmt.Sprintf("recovered from errgroup.Group: %v", p.Recovered) } diff --git a/vendor/gorm.io/driver/mysql/migrator.go b/vendor/gorm.io/driver/mysql/migrator.go index e266cfdc..018368d1 100644 --- a/vendor/gorm.io/driver/mysql/migrator.go +++ b/vendor/gorm.io/driver/mysql/migrator.go @@ -109,7 +109,7 @@ func (m Migrator) MigrateColumnUnique(value interface{}, field *schema.Field, co return err } } - if field.UniqueIndex != "" { + if field.UniqueIndex != "" && !queryTx.Migrator().HasIndex(value, field.UniqueIndex) { if err := execTx.Migrator().CreateIndex(value, field.UniqueIndex); err != nil { return err } diff --git a/vendor/gorm.io/driver/mysql/mysql.go b/vendor/gorm.io/driver/mysql/mysql.go index 8b6ef3db..d203577f 100644 --- a/vendor/gorm.io/driver/mysql/mysql.go +++ b/vendor/gorm.io/driver/mysql/mysql.go @@ -185,7 +185,9 @@ func (dialector Dialector) Initialize(db *gorm.DB) (err error) { callbacks.RegisterDefaultCallbacks(db, callbackConfig) for k, v := range dialector.ClauseBuilders() { - db.ClauseBuilders[k] = v + if _, ok := db.ClauseBuilders[k]; !ok { + db.ClauseBuilders[k] = v + } } return } diff --git a/vendor/gorm.io/driver/sqlite/ddlmod.go b/vendor/gorm.io/driver/sqlite/ddlmod.go index c839cd79..e7e58597 100644 --- a/vendor/gorm.io/driver/sqlite/ddlmod.go +++ b/vendor/gorm.io/driver/sqlite/ddlmod.go @@ -209,8 +209,12 @@ func (d *ddl) renameTable(dst, src string) error { return nil } +func compileConstraintRegexp(name string) *regexp.Regexp { + return regexp.MustCompile("^(?i:CONSTRAINT)\\s+[\"`]?" + regexp.QuoteMeta(name) + "[\"`\\s]") +} + func (d *ddl) addConstraint(name string, sql string) { - reg := regexp.MustCompile("^CONSTRAINT [\"`]?" + regexp.QuoteMeta(name) + "[\"` ]") + reg := compileConstraintRegexp(name) for i := 0; i < len(d.fields); i++ { if reg.MatchString(d.fields[i]) { @@ -223,7 +227,7 @@ func (d *ddl) addConstraint(name string, sql string) { } func (d *ddl) removeConstraint(name string) bool { - reg := regexp.MustCompile("^CONSTRAINT [\"`]?" + regexp.QuoteMeta(name) + "[\"` ]") + reg := compileConstraintRegexp(name) for i := 0; i < len(d.fields); i++ { if reg.MatchString(d.fields[i]) { @@ -235,7 +239,7 @@ func (d *ddl) removeConstraint(name string) bool { } func (d *ddl) hasConstraint(name string) bool { - reg := regexp.MustCompile("^CONSTRAINT [\"`]?" + regexp.QuoteMeta(name) + "[\"` ]") + reg := compileConstraintRegexp(name) for _, f := range d.fields { if reg.MatchString(f) { diff --git a/vendor/gorm.io/driver/sqlite/sqlite.go b/vendor/gorm.io/driver/sqlite/sqlite.go index 0543d0b1..418842aa 100644 --- a/vendor/gorm.io/driver/sqlite/sqlite.go +++ b/vendor/gorm.io/driver/sqlite/sqlite.go @@ -76,7 +76,9 @@ func (dialector Dialector) Initialize(db *gorm.DB) (err error) { } for k, v := range dialector.ClauseBuilders() { - db.ClauseBuilders[k] = v + if _, ok := db.ClauseBuilders[k]; !ok { + db.ClauseBuilders[k] = v + } } return } diff --git a/vendor/modules.txt b/vendor/modules.txt index b18b786a..b269cd6f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -12,7 +12,7 @@ github.com/asaskevich/govalidator # github.com/beorn7/perks v1.0.1 ## explicit; go 1.11 github.com/beorn7/perks/quantile -# github.com/bradleyfalzon/ghinstallation/v2 v2.15.0 +# github.com/bradleyfalzon/ghinstallation/v2 v2.16.0 ## explicit; go 1.23.0 github.com/bradleyfalzon/ghinstallation/v2 # github.com/cespare/xxhash/v2 v2.3.0 @@ -36,7 +36,7 @@ github.com/davecgh/go-spew/spew # github.com/felixge/httpsnoop v1.0.4 ## explicit; go 1.13 github.com/felixge/httpsnoop -# github.com/go-logr/logr v1.4.2 +# github.com/go-logr/logr v1.4.3 ## explicit; go 1.18 github.com/go-logr/logr github.com/go-logr/logr/funcr @@ -88,7 +88,7 @@ github.com/go-openapi/swag # github.com/go-openapi/validate v0.24.0 ## explicit; go 1.20 github.com/go-openapi/validate -# github.com/go-sql-driver/mysql v1.9.2 +# github.com/go-sql-driver/mysql v1.9.3 ## explicit; go 1.21.0 github.com/go-sql-driver/mysql # github.com/golang-jwt/jwt/v4 v4.5.2 @@ -97,9 +97,9 @@ github.com/golang-jwt/jwt/v4 # github.com/golang-jwt/jwt/v5 v5.2.2 ## explicit; go 1.18 github.com/golang-jwt/jwt/v5 -# github.com/google/go-github/v71 v71.0.0 +# github.com/google/go-github/v72 v72.0.0 ## explicit; go 1.23.0 -github.com/google/go-github/v71/github +github.com/google/go-github/v72/github # github.com/google/go-querystring v1.1.0 ## explicit; go 1.10 github.com/google/go-querystring/query @@ -208,8 +208,8 @@ github.com/prometheus/client_golang/prometheus/promhttp/internal # github.com/prometheus/client_model v0.6.2 ## explicit; go 1.22.0 github.com/prometheus/client_model/go -# github.com/prometheus/common v0.63.0 -## explicit; go 1.21 +# github.com/prometheus/common v0.64.0 +## explicit; go 1.23.0 github.com/prometheus/common/expfmt github.com/prometheus/common/model # github.com/prometheus/procfs v0.16.1 @@ -239,7 +239,7 @@ github.com/stretchr/testify/suite # github.com/teris-io/shortid v0.0.0-20220617161101-71ec9f2aa569 ## explicit; go 1.18 github.com/teris-io/shortid -# go.mongodb.org/mongo-driver v1.17.3 +# go.mongodb.org/mongo-driver v1.17.4 ## explicit; go 1.18 go.mongodb.org/mongo-driver/bson go.mongodb.org/mongo-driver/bson/bsoncodec @@ -252,14 +252,13 @@ go.mongodb.org/mongo-driver/x/bsonx/bsoncore ## explicit; go 1.22.0 go.opentelemetry.io/auto/sdk go.opentelemetry.io/auto/sdk/internal/telemetry -# go.opentelemetry.io/otel v1.35.0 -## explicit; go 1.22.0 +# go.opentelemetry.io/otel v1.36.0 +## explicit; go 1.23.0 go.opentelemetry.io/otel go.opentelemetry.io/otel/attribute +go.opentelemetry.io/otel/attribute/internal go.opentelemetry.io/otel/baggage go.opentelemetry.io/otel/codes -go.opentelemetry.io/otel/internal -go.opentelemetry.io/otel/internal/attribute go.opentelemetry.io/otel/internal/baggage go.opentelemetry.io/otel/internal/global go.opentelemetry.io/otel/propagation @@ -267,17 +266,17 @@ go.opentelemetry.io/otel/semconv/internal/v2 go.opentelemetry.io/otel/semconv/v1.17.0 go.opentelemetry.io/otel/semconv/v1.17.0/httpconv go.opentelemetry.io/otel/semconv/v1.26.0 -# go.opentelemetry.io/otel/metric v1.35.0 -## explicit; go 1.22.0 +# go.opentelemetry.io/otel/metric v1.36.0 +## explicit; go 1.23.0 go.opentelemetry.io/otel/metric go.opentelemetry.io/otel/metric/embedded -# go.opentelemetry.io/otel/trace v1.35.0 -## explicit; go 1.22.0 +# go.opentelemetry.io/otel/trace v1.36.0 +## explicit; go 1.23.0 go.opentelemetry.io/otel/trace go.opentelemetry.io/otel/trace/embedded go.opentelemetry.io/otel/trace/internal/telemetry go.opentelemetry.io/otel/trace/noop -# golang.org/x/crypto v0.38.0 +# golang.org/x/crypto v0.39.0 ## explicit; go 1.23.0 golang.org/x/crypto/bcrypt golang.org/x/crypto/blowfish @@ -286,10 +285,10 @@ golang.org/x/crypto/chacha20poly1305 golang.org/x/crypto/hkdf golang.org/x/crypto/internal/alias golang.org/x/crypto/internal/poly1305 -# golang.org/x/mod v0.24.0 +# golang.org/x/mod v0.25.0 ## explicit; go 1.23.0 golang.org/x/mod/semver -# golang.org/x/net v0.40.0 +# golang.org/x/net v0.41.0 ## explicit; go 1.23.0 golang.org/x/net/internal/socks golang.org/x/net/proxy @@ -297,7 +296,7 @@ golang.org/x/net/proxy ## explicit; go 1.23.0 golang.org/x/oauth2 golang.org/x/oauth2/internal -# golang.org/x/sync v0.14.0 +# golang.org/x/sync v0.15.0 ## explicit; go 1.23.0 golang.org/x/sync/errgroup # golang.org/x/sys v0.33.0 @@ -305,7 +304,7 @@ golang.org/x/sync/errgroup golang.org/x/sys/cpu golang.org/x/sys/unix golang.org/x/sys/windows -# golang.org/x/text v0.25.0 +# golang.org/x/text v0.26.0 ## explicit; go 1.23.0 golang.org/x/text/cases golang.org/x/text/internal @@ -359,10 +358,10 @@ gopkg.in/yaml.v3 # gorm.io/datatypes v1.2.5 ## explicit; go 1.19 gorm.io/datatypes -# gorm.io/driver/mysql v1.5.7 -## explicit; go 1.14 +# gorm.io/driver/mysql v1.6.0 +## explicit; go 1.18 gorm.io/driver/mysql -# gorm.io/driver/sqlite v1.5.7 +# gorm.io/driver/sqlite v1.6.0 ## explicit; go 1.20 gorm.io/driver/sqlite # gorm.io/gorm v1.30.0