From b7bee273daaa95c04281103c60f574e0ba82d96c Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Fri, 16 Feb 2024 10:07:29 +0200 Subject: [PATCH] [v10.2.x] Chore: Remove grafana-delivery references (#82536) Chore: Remove `grafana-delivery` references (#82505) * s/grafana-delivery/grafana-release-guild/g * Remove -squad suffix (cherry picked from commit a6bc262093c15538466f4168b3695ab0633ae659) --- .../create-security-patch-from-security-mirror.yml | 6 +++--- .github/workflows/pr-patch-check.yml | 2 +- .github/workflows/sync-mirror.yml | 2 +- contribute/drone-pipeline.md | 2 +- go.mod | 14 +++++++------- scripts/modowners/README.md | 4 ++-- scripts/modowners/modowners.go | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/create-security-patch-from-security-mirror.yml b/.github/workflows/create-security-patch-from-security-mirror.yml index 413addb6827..e187149b8b4 100644 --- a/.github/workflows/create-security-patch-from-security-mirror.yml +++ b/.github/workflows/create-security-patch-from-security-mirror.yml @@ -1,5 +1,5 @@ -# Owned by grafana-delivery-squad -# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror. +# Owned by grafana-release-guild +# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror. name: Create security patch run-name: create-security-patch on: @@ -17,7 +17,7 @@ jobs: trigger_downstream_create_security_patch: concurrency: create-patch-${{ github.ref_name }} uses: grafana/security-patch-actions/.github/workflows/create-patch.yml@main - if: github.repository == 'grafana/grafana-security-mirror' + if: github.repository == 'grafana/grafana-security-mirror' with: repo: "${{ github.repository }}" src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing" diff --git a/.github/workflows/pr-patch-check.yml b/.github/workflows/pr-patch-check.yml index 1ff327ebdef..a7896130e31 100644 --- a/.github/workflows/pr-patch-check.yml +++ b/.github/workflows/pr-patch-check.yml @@ -1,4 +1,4 @@ -# Owned by grafana-delivery-squad +# Owned by grafana-release-guild # Intended to be dropped into the base repo Ex: grafana/grafana name: Check for patch conflicts run-name: check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }} diff --git a/.github/workflows/sync-mirror.yml b/.github/workflows/sync-mirror.yml index fd8d93d6226..09c8f87d509 100644 --- a/.github/workflows/sync-mirror.yml +++ b/.github/workflows/sync-mirror.yml @@ -1,4 +1,4 @@ -# Owned by grafana-delivery-squad +# Owned by grafana-release-guild # Intended to be dropped into the base repo, Ex: grafana/grafana name: Sync to mirror run-name: sync-to-mirror-${{ github.ref_name }} diff --git a/contribute/drone-pipeline.md b/contribute/drone-pipeline.md index 2d0b74db046..b75ab2649c7 100644 --- a/contribute/drone-pipeline.md +++ b/contribute/drone-pipeline.md @@ -14,4 +14,4 @@ The Drone pipelines are built with [Starlark](https://github.com/bazelbuild/star - Open a PR where you can do test runs for your changes. If you need to experiment with secrets, create a PR in the [grafana-ci-sandbox repo](https://github.com/grafana/grafana-ci-sandbox), before opening a PR in the main repo. - Run `make drone` after making changes to the Starlark files. This builds the `.drone.yml` file. -For further questions, reach out to the grafana-delivery squad. +For further questions, reach out to the grafana-release-guild squad. diff --git a/go.mod b/go.mod index 2331682d21a..65365165877 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/aws/aws-sdk-go v1.44.325 // @grafana/aws-datasources github.com/beevik/etree v1.2.0 // @grafana/backend-platform github.com/benbjohnson/clock v1.3.5 // @grafana/alerting-squad-backend - github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-delivery + github.com/blang/semver/v4 v4.0.0 // @grafana/grafana-release-guild github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // @grafana/backend-platform github.com/centrifugal/centrifuge v0.30.2 // @grafana/grafana-app-platform-squad github.com/crewjam/saml v0.4.13 // @grafana/grafana-authnz-team @@ -80,7 +80,7 @@ require ( github.com/lib/pq v1.10.9 // @grafana/backend-platform github.com/linkedin/goavro/v2 v2.10.0 // @grafana/backend-platform github.com/m3db/prometheus_remote_client_golang v0.4.4 // @grafana/backend-platform - github.com/magefile/mage v1.15.0 // @grafana/grafana-delivery + github.com/magefile/mage v1.15.0 // @grafana/grafana-release-guild github.com/mattn/go-isatty v0.0.18 // @grafana/backend-platform github.com/mattn/go-sqlite3 v1.14.16 // @grafana/backend-platform github.com/matttproud/golang_protobuf_extensions v1.0.4 // @grafana/alerting-squad-backend @@ -236,11 +236,11 @@ require ( github.com/blugelabs/bluge_segment_api v0.2.0 // @grafana/backend-platform github.com/bufbuild/connect-go v1.10.0 // @grafana/observability-traces-and-profiling github.com/dlmiddlecote/sqlstats v1.0.2 // @grafana/backend-platform - github.com/drone/drone-cli v1.6.1 // @grafana/grafana-delivery + github.com/drone/drone-cli v1.6.1 // @grafana/grafana-release-guild github.com/getkin/kin-openapi v0.120.0 // @grafana/grafana-operator-experience-squad github.com/golang-migrate/migrate/v4 v4.7.0 // @grafana/backend-platform - github.com/google/go-github v17.0.0+incompatible // @grafana/grafana-delivery - github.com/google/go-github/v45 v45.2.0 // @grafana/grafana-delivery + github.com/google/go-github v17.0.0+incompatible // @grafana/grafana-release-guild + github.com/google/go-github/v45 v45.2.0 // @grafana/grafana-release-guild github.com/grafana/codejen v0.0.3 // @grafana/dataviz-squad github.com/grafana/dskit v0.0.0-20230706162620-5081d8ed53e6 // @grafana/backend-platform github.com/huandu/xstrings v1.3.1 // @grafana/partner-datasources @@ -257,7 +257,7 @@ require ( require ( buf.build/gen/go/parca-dev/parca/bufbuild/connect-go v1.4.1-20221222094228-8b1d3d0f62e6.1 // @grafana/observability-traces-and-profiling buf.build/gen/go/parca-dev/parca/protocolbuffers/go v1.28.1-20221222094228-8b1d3d0f62e6.4 // @grafana/observability-traces-and-profiling - github.com/Masterminds/semver/v3 v3.1.1 // @grafana/grafana-delivery + github.com/Masterminds/semver/v3 v3.1.1 // @grafana/grafana-release-guild github.com/alicebob/miniredis/v2 v2.30.1 // @grafana/alerting-squad-backend github.com/dave/dst v0.27.2 // @grafana/grafana-as-code github.com/go-jose/go-jose/v3 v3.0.1 // @grafana/backend-platform @@ -454,7 +454,7 @@ require ( github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/dgryski/go-metro v0.0.0-20211217172704-adc40b04c140 // indirect - github.com/docker/docker v23.0.4+incompatible // @grafana/grafana-delivery + github.com/docker/docker v23.0.4+incompatible // @grafana/grafana-release-guild github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027 // indirect github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect github.com/go-logr/logr v1.3.0 // @grafana/grafana-app-platform-squad diff --git a/scripts/modowners/README.md b/scripts/modowners/README.md index 5b70fe37f48..6edd78b067e 100644 --- a/scripts/modowners/README.md +++ b/scripts/modowners/README.md @@ -35,7 +35,7 @@ Example CLI command to get a list of all owners with a count of the number of de Example output: ``` -@grafana/grafana-delivery 5 +@grafana/grafana-release-guild 5 @grafana/grafana-bi-squad 2 @grafana/grafana-app-platform-squad 13 @grafana/observability-metrics 4 @@ -67,7 +67,7 @@ List all dependencies of given owner(s). Example CLI command to list all direct dependencies owned by Delivery and Authnz: -`go run scripts/modowners/modowners.go modules -o @grafana/grafana-delivery,@grafana/identity-access-team go.mod` +`go run scripts/modowners/modowners.go modules -o @grafana/grafana-release-guild,@grafana/identity-access-team go.mod` Example output: diff --git a/scripts/modowners/modowners.go b/scripts/modowners/modowners.go index f34c42a1a85..c2597f90ef0 100755 --- a/scripts/modowners/modowners.go +++ b/scripts/modowners/modowners.go @@ -129,7 +129,7 @@ func owners(fileSystem fs.FS, logger *log.Logger, args []string) error { } // Print dependencies for a given owner. Can specify one or more owners. -// An example CLI command to list all direct dependencies owned by Delivery and Authnz `go run scripts/modowners/modowners.go modules -o @grafana/grafana-delivery,@grafana/identity-access-team go.mod` +// An example CLI command to list all direct dependencies owned by Delivery and Authnz `go run scripts/modowners/modowners.go modules -o @grafana/grafana-release-guild,@grafana/identity-access-team go.mod` func modules(fileSystem fs.FS, logger *log.Logger, args []string) error { fs := flag.NewFlagSet("modules", flag.ExitOnError) indirect := fs.Bool("i", false, "print indirect dependencies")