Skip to content

Commit

Permalink
Part 1 - Rename stacklok.com/mediator to stacklok.com/minder (#1447)
Browse files Browse the repository at this point in the history
Rename stacklok.com/mediator to stacklok.com/minder

Signed-off-by: Radoslav Dimitrov <[email protected]>
  • Loading branch information
rdimitrov authored Nov 3, 2023
1 parent aedd79d commit fd3a0a3
Show file tree
Hide file tree
Showing 204 changed files with 606 additions and 607 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# github_token: ${{ secrets.GITHUB_TOKEN }}
# - uses: bufbuild/buf-breaking-action@v1
# with:
# against: "https://github.com/stacklok/mediator.git#branch=main"
# against: "https://github.com/stacklok/minder.git#branch=main"

sqlc-generation:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- run: |
ko build --platform=linux/amd64,linux/arm64 --push=false ./cmd/server \
--image-label=org.opencontainers.image.source=https://github.com/stacklok/mediator,org.opencontainers.image.title="Stacklok Mediator",org.opencontainers.image.licenses=Apache-2.0,org.opencontainers.image.vendor=Stacklok
--image-label=org.opencontainers.image.source=https://github.com/stacklok/minder,org.opencontainers.image.title="Stacklok Mediator",org.opencontainers.image.licenses=Apache-2.0,org.opencontainers.image.vendor=Stacklok
env:
KO_DOCKER_REPO: "ko.local"
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ linters-settings:
sections:
- standard
- default
- prefix(github.com/stacklok/mediator)
- prefix(github.com/stacklok/minder)
revive:
# see https://github.com/mgechev/revive#available-rules for details.
ignore-generated-header: true
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This project adheres to the [Contributor Covenant](https://github.com/stacklok/m

### Reporting Security Vulnerabilities

If you think you have found a security vulnerability in Minder please DO NOT disclose it publicly until we’ve had a chance to fix it. Please don’t report security vulnerabilities using GitHub issues; instead, please follow this [process](https://github.com/stacklok/mediator/blob/main/SECURITY.md)
If you think you have found a security vulnerability in Minder please DO NOT disclose it publicly until we’ve had a chance to fix it. Please don’t report security vulnerabilities using GitHub issues; instead, please follow this [process](https://github.com/stacklok/minder/blob/main/SECURITY.md)
### How to Contribute

#### Using GitHub Issues
Expand All @@ -26,10 +26,10 @@ We use GitHub issues to track bugs and enhancements. If you have a general usage
If you are reporting a bug, please help to speed up problem diagnosis by providing as much information as possible. Ideally, that would include a small sample project that reproduces the problem.

#### Sign the Contributor License Agreement
Before we accept a non-trivial patch or pull request, we will need you to sign the [Contributor License Agreement](https://github.com/stacklok/mediator). Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team and given the ability to merge pull requests.
Before we accept a non-trivial patch or pull request, we will need you to sign the [Contributor License Agreement](https://github.com/stacklok/minder). Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. Active contributors might be asked to join the core team and given the ability to merge pull requests.

#### Not sure how to start contributing...
PRs to resolve existing issues are greatly appreciated and issues labeled as ["good first issue"](https://github.com/stacklok/mediator/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) are a great place to start!
PRs to resolve existing issues are greatly appreciated and issues labeled as ["good first issue"](https://github.com/stacklok/minder/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) are a great place to start!

#### Pull Request Process
* Create an issue outlining the fix or feature.
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ run-docker: ## run the app under docker.
# podman (at least) doesn't seem to like multi-arch images, and sometimes picks the wrong one (e.g. amd64 on arm64)
# We also need to remove the build: directives to use ko builds
# ko resolve will fill in the image: field in the compose file, but it adds a yaml document separator
sed -e '/^ *build:/d' -e 's| image: mediator:latest| image: ko://github.com/stacklok/mediator/cmd/server|' docker-compose.yaml | ko resolve --base-import-paths --platform linux/$(DOCKERARCH) -f - | sed 's/^--*$$//' > .resolved-compose.yaml
sed -e '/^ *build:/d' -e 's| image: mediator:latest| image: ko://github.com/stacklok/minder/cmd/server|' docker-compose.yaml | ko resolve --base-import-paths --platform linux/$(DOCKERARCH) -f - | sed 's/^--*$$//' > .resolved-compose.yaml
@echo "Running docker-compose up $(services)"
$(COMPOSE) -f .resolved-compose.yaml down && $(COMPOSE) -f .resolved-compose.yaml up $(COMPOSE_ARGS) $(services)
rm .resolved-compose.yaml*
Expand Down Expand Up @@ -143,9 +143,9 @@ dbschema: ## generate database schema with schema spy, monitor file until doc is
cd database/schema && $(COMPOSE) down -v && rm -rf output

mock: ## generate mocks
mockgen -package mockdb -destination database/mock/store.go github.com/stacklok/mediator/internal/db Store
mockgen -package mockdb -destination database/mock/store.go github.com/stacklok/minder/internal/db Store
mockgen -package mockgh -destination internal/providers/github/mock/github.go -source pkg/providers/v1/providers.go GitHub
mockgen -package auth -destination internal/auth/mock/jwtauth.go github.com/stacklok/mediator/internal/auth JwtValidator,KeySetFetcher
mockgen -package auth -destination internal/auth/mock/jwtauth.go github.com/stacklok/minder/internal/auth JwtValidator,KeySetFetcher

github-login: ## setup GitHub login on Keycloak
ifndef KC_GITHUB_CLIENT_ID
Expand Down
6 changes: 3 additions & 3 deletions buf.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ plugins:
- name: go
out: .
#out: pkg/api/protobuf/go
opt: module=github.com/stacklok/mediator
opt: module=github.com/stacklok/minder
- name: go-grpc
out: .
#out: pkg/api/protobuf/go
opt:
- module=github.com/stacklok/mediator
- module=github.com/stacklok/minder
- name: grpc-gateway
out: .
#out: pkg/api/protobuf/go
opt:
- module=github.com/stacklok/mediator
- module=github.com/stacklok/minder
- name: openapiv2
out: pkg/api/openapi
- plugin: doc
Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/app/apply/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"google.golang.org/grpc/status"
"gopkg.in/yaml.v3"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/mediator/internal/util"
"github.com/stacklok/minder/cmd/cli/app"
"github.com/stacklok/minder/internal/util"
)

type objectParameters struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/app/artifact/artifact.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package artifact
import (
"github.com/spf13/cobra"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/minder/cmd/cli/app"
)

// ArtifactCmd is the artifact subcommand
Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/app/artifact/artifact_get.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/internal/util"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/internal/util"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

var artifact_getCmd = &cobra.Command{
Expand Down
6 changes: 3 additions & 3 deletions cmd/cli/app/artifact/artifact_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/internal/auth"
"github.com/stacklok/mediator/internal/util"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/internal/auth"
"github.com/stacklok/minder/internal/util"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

var artifact_listCmd = &cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/app/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package auth
import (
"github.com/spf13/cobra"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/minder/cmd/cli/app"
)

// AuthCmd represents the account command
Expand Down
8 changes: 4 additions & 4 deletions cmd/cli/app/auth/auth_delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/internal/auth"
"github.com/stacklok/mediator/internal/util"
"github.com/stacklok/mediator/internal/util/cli"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/internal/auth"
"github.com/stacklok/minder/internal/util"
"github.com/stacklok/minder/internal/util/cli"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

// auth_deleteCmd represents the account deletion command
Expand Down
10 changes: 5 additions & 5 deletions cmd/cli/app/auth/auth_login.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

mcrypto "github.com/stacklok/mediator/internal/crypto"
"github.com/stacklok/mediator/internal/util"
"github.com/stacklok/mediator/internal/util/cli"
"github.com/stacklok/mediator/internal/util/rand"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
mcrypto "github.com/stacklok/minder/internal/crypto"
"github.com/stacklok/minder/internal/util"
"github.com/stacklok/minder/internal/util/cli"
"github.com/stacklok/minder/internal/util/rand"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

func userRegistered(ctx context.Context, client pb.UserServiceClient) (bool, *pb.GetUserResponse, error) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/app/auth/auth_logout.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/internal/util"
"github.com/stacklok/mediator/internal/util/cli"
"github.com/stacklok/minder/internal/util"
"github.com/stacklok/minder/internal/util/cli"
)

// auth_logoutCmd represents the logout command
Expand Down
6 changes: 3 additions & 3 deletions cmd/cli/app/auth/auth_revoke_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/internal/util"
"github.com/stacklok/mediator/internal/util/cli"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/internal/util"
"github.com/stacklok/minder/internal/util/cli"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

// Auth_revokeproviderCmd represents the auth revoke command
Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/app/auth/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/spf13/viper"
"github.com/stretchr/testify/assert"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/mediator/internal/util"
"github.com/stacklok/minder/cmd/cli/app"
"github.com/stacklok/minder/internal/util"
)

func TestCobraMain(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/cli/app/auth/auth_whoami.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/spf13/viper"
"google.golang.org/grpc"

"github.com/stacklok/mediator/internal/util"
"github.com/stacklok/mediator/internal/util/cli"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/internal/util"
"github.com/stacklok/minder/internal/util/cli"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

// authWhoamiCmd represents the whoami command
Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/app/docs/docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/spf13/cobra/doc"
"github.com/spf13/viper"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/mediator/internal/util"
"github.com/stacklok/minder/cmd/cli/app"
"github.com/stacklok/minder/internal/util"
)

// DocsCmd generates documentation
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/app/profile/profile.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package profile
import (
"github.com/spf13/cobra"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/minder/cmd/cli/app"
)

// ProfileCmd is the root command for the profile subcommands
Expand Down
6 changes: 3 additions & 3 deletions cmd/cli/app/profile/profile_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/internal/engine"
"github.com/stacklok/mediator/internal/util"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/internal/engine"
"github.com/stacklok/minder/internal/util"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

// Profile_createCmd represents the profile create command
Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/app/profile/profile_delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/internal/util"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/internal/util"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

var profile_deleteCmd = &cobra.Command{
Expand Down
6 changes: 3 additions & 3 deletions cmd/cli/app/profile/profile_get.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/mediator/internal/util"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/cmd/cli/app"
"github.com/stacklok/minder/internal/util"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

var profile_getCmd = &cobra.Command{
Expand Down
6 changes: 3 additions & 3 deletions cmd/cli/app/profile/profile_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/mediator/internal/util"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/cmd/cli/app"
"github.com/stacklok/minder/internal/util"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

var profile_listCmd = &cobra.Command{
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/app/profile/table_render.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"google.golang.org/protobuf/types/known/structpb"
"gopkg.in/yaml.v2"

minderv1 "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
minderv1 "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

func initializeTable(cmd *cobra.Command) *tablewriter.Table {
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/app/profile_status/profile_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package profile_status
import (
"github.com/spf13/cobra"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/minder/cmd/cli/app"
)

// ProfileStatusCmd is the root command for the profile_status subcommands
Expand Down
8 changes: 4 additions & 4 deletions cmd/cli/app/profile_status/profile_status_get.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/mediator/internal/entities"
"github.com/stacklok/mediator/internal/util"
minderv1 "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/cmd/cli/app"
"github.com/stacklok/minder/internal/entities"
"github.com/stacklok/minder/internal/util"
minderv1 "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

var profilestatus_getCmd = &cobra.Command{
Expand Down
6 changes: 3 additions & 3 deletions cmd/cli/app/profile_status/profile_status_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/mediator/internal/util"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
"github.com/stacklok/minder/cmd/cli/app"
"github.com/stacklok/minder/internal/util"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

var profilestatus_listCmd = &cobra.Command{
Expand Down
4 changes: 2 additions & 2 deletions cmd/cli/app/profile_status/table_render.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/spf13/cobra"
"gopkg.in/yaml.v2"

pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

const (
Expand Down Expand Up @@ -198,7 +198,7 @@ func guidanceOrEncouragement(status, guidance string) string {
}

// TODO: use a color scheme for minder instead of a pre-defined one.
// Related-to: https://github.com/stacklok/mediator/issues/1006
// Related-to: https://github.com/stacklok/minder/issues/1006
renderedGuidance, err := glamour.Render(guidance, "dark")
if err != nil {
return guidance
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/app/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package provider
import (
"github.com/spf13/cobra"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/minder/cmd/cli/app"
)

// ProviderCmd is the root command for the provider subcommands
Expand Down
10 changes: 5 additions & 5 deletions cmd/cli/app/provider/provider_enroll.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ import (
"github.com/spf13/viper"
"google.golang.org/protobuf/types/known/timestamppb"

ghclient "github.com/stacklok/mediator/internal/providers/github"
"github.com/stacklok/mediator/internal/util"
"github.com/stacklok/mediator/internal/util/cli"
"github.com/stacklok/mediator/internal/util/rand"
pb "github.com/stacklok/mediator/pkg/api/protobuf/go/minder/v1"
ghclient "github.com/stacklok/minder/internal/providers/github"
"github.com/stacklok/minder/internal/util"
"github.com/stacklok/minder/internal/util/cli"
"github.com/stacklok/minder/internal/util/rand"
pb "github.com/stacklok/minder/pkg/api/protobuf/go/minder/v1"
)

// Response is the response from the OAuth callback server.
Expand Down
2 changes: 1 addition & 1 deletion cmd/cli/app/repo/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package repo
import (
"github.com/spf13/cobra"

"github.com/stacklok/mediator/cmd/cli/app"
"github.com/stacklok/minder/cmd/cli/app"
)

// RepoCmd is the root command for the repo subcommands
Expand Down
Loading

0 comments on commit fd3a0a3

Please sign in to comment.