Merge branch 'master' into user-identity-mapping-job

.codecov.yaml

@@ -0,0 +1,44 @@
+# Config can be validated before merging: curl -X POST --data-binary @.codecov.yaml https://codecov.io/validate
+codecov:
+  max_report_age: "off"  # see https://docs.codecov.io/docs/codecov-yaml#section-expired-reports
+
+# See http://docs.codecov.io/docs/coverage-configuration
+coverage:
+  precision: 2  # 2 = xx.xx%, 0 = xx%
+  round: down
+  # For example: 20...60 would result in any coverage less than 20%
+  # would have a red background. The color would gradually change to
+  # green approaching 60%. Any coverage over 60% would result in a
+  # solid green color.
+  range: "20...60"
+
+  # See https://docs.codecov.com/docs/commit-status
+  status:
+    # project will give us the diff in the total code coverage between a commit
+    # and its parent
+    project:
+      default:
+        # Allow the coverage to drop by 1%, and posting a success status.
+        threshold: 1%
+    # Patch gives just the coverage of the patch
+    patch: yes
+    # changes tells us if there are unexpected code coverage changes in other files
+    # which were not changed by the diff
+    changes: yes
+
+  # See http://docs.codecov.io/docs/ignoring-paths
+  ignore:
+  - "github/*"
+  - "cmd/*"
+  - "make/*"
+  - "resources/*"
+  - "test-resources/*"
+
+# See https://docs.codecov.com/docs/pull-request-comments
+comment:
+  layout: "header, diff, tree"
+  # default = posts once then update, posts new if delete
+  # once = post once then updates
+  # new = delete old, post new
+  # spammy = post new
+  behavior: "new"

.github/workflows/ci-check-gomod.yml

@@ -13,10 +13,5 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-
     - name: check
-      run: |
-        if [[ -n "$(grep 'replace github.com/kubesaw/.*' go.mod || true)" ]]; then
-          echo "forbidden replacement in go.mod"
-          exit 1
-        fi
+      uses: codeready-toolchain/toolchain-cicd/gomod-check@master

.github/workflows/linters.yml

@@ -0,0 +1,46 @@
+name: ci-build
+on:
+  push:
+    branches:
+    - master
+    tags-ignore:
+    - '*.*'
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  golangci:
+    name: GolangCI Lint
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: 1.20.x
+
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Lint
+      uses: golangci/golangci-lint-action@v4
+      with:
+        version: v1.56.2
+        skip-pkg-cache: true
+        skip-build-cache: true
+        args: --config=./.golangci.yml --verbose
+
+  yammlint:
+    name: YAML Lint
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Install yamllint
+      run: pip install yamllint
+
+    - name: Lint YAML files
+      run: yamllint -c .yamllint ./

.github/workflows/workflow.yml → .github/workflows/test-with-coverage.yml

@@ -5,7 +5,8 @@ on:
     - master
     tags-ignore:
     - '*.*'
-  pull_request:
+  pull_request_target:
+    types: [ opened, synchronize, reopened, ready_for_review ]
     branches:
     - master
 
@@ -15,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-    name: Test on ${{ matrix.os }}
+    name: Test with coverage
 
     steps:
     - name: Install Go
@@ -25,6 +26,10 @@ jobs:
 
     - name: Checkout code
       uses: actions/checkout@v4
+      with:
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+        fetch-depth: 0
 
     - name: Cache dependencies
       uses: actions/cache@v4
@@ -49,38 +54,3 @@ jobs:
         flags: unittests # optional
         fail_ci_if_error: true # optional (default = false)
         verbose: true # optional (default = false)
-
-  golangci:
-    name: GolangCI Lint
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v5
-      with:
-        go-version: 1.20.x
-
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Lint
-      uses: golangci/golangci-lint-action@v4
-      with:
-        version: v1.56.2
-        skip-pkg-cache: true
-        skip-build-cache: true
-        args: --config=./.golangci.yml --verbose
-
-  yammlint:
-    name: YAML Lint
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-
-    - name: Install yamllint
-      run: pip install yamllint
-
-    - name: Lint YAML files
-      run: yamllint -c .yamllint ./

CODEOWNERS

@@ -1 +1 @@
-* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @ranakan19 @sbryzak @mfrancisc @drpaneas
+* @MatousJobanek @xcoulon @alexeykazakov @rajivnathan @ranakan19 @sbryzak @mfrancisc @drpaneas @metlos @fbm3307

pkg/client/client.go

@@ -114,7 +114,7 @@ func PatchUserSignup(ctx *clicontext.CommandContext, name string, changeUserSign
 	if err != nil {
 		return err
 	}
-	userSignup, err := GetUserSignup(cl, cfg.SandboxNamespace, name)
+	userSignup, err := GetUserSignup(cl, cfg.OperatorNamespace, name)
 	if err != nil {
 		return err
 	}
@@ -151,7 +151,7 @@ func PatchMasterUserRecord(ctx *clicontext.CommandContext, name string, changeMa
 	if err != nil {
 		return err
 	}
-	mur, err := GetMasterUserRecord(cl, cfg.SandboxNamespace, name)
+	mur, err := GetMasterUserRecord(cl, cfg.OperatorNamespace, name)
 	if err != nil {
 		return err
 	}
@@ -188,7 +188,7 @@ func PatchSpace(ctx *clicontext.CommandContext, name string, changeSpace func(*t
 	if err != nil {
 		return err
 	}
-	space, err := GetSpace(cl, cfg.SandboxNamespace, name)
+	space, err := GetSpace(cl, cfg.OperatorNamespace, name)
 	if err != nil {
 		return err
 	}
@@ -244,7 +244,7 @@ func ListSpaceBindings(cl runtimeclient.Client, namespace string, opts ...SpaceB
 
 func GetNSTemplateTier(cfg configuration.ClusterConfig, cl runtimeclient.Client, name string) (*toolchainv1alpha1.NSTemplateTier, error) {
 	namespacedName := types.NamespacedName{
-		Namespace: cfg.SandboxNamespace,
+		Namespace: cfg.OperatorNamespace,
 		Name:      name,
 	}
 	obj := &toolchainv1alpha1.NSTemplateTier{}
@@ -256,7 +256,7 @@ func GetNSTemplateTier(cfg configuration.ClusterConfig, cl runtimeclient.Client,
 
 func GetUserTier(cfg configuration.ClusterConfig, cl runtimeclient.Client, name string) (*toolchainv1alpha1.UserTier, error) {
 	namespacedName := types.NamespacedName{
-		Namespace: cfg.SandboxNamespace,
+		Namespace: cfg.OperatorNamespace,
 		Name:      name,
 	}
 	obj := &toolchainv1alpha1.UserTier{}

pkg/client/client_test.go

@@ -26,14 +26,14 @@ import (
 func TestNewClientOK(t *testing.T) {
 	// given
 	t.Cleanup(gock.OffAll)
-	gock.New("https://example.com").
+	gock.New("http://example.com").
 		Get("api").
 		Persist().
 		Reply(200).
 		BodyString("{}")
 
 	// when
-	cl, err := client.NewClient("cool-token", "https://example.com")
+	cl, err := client.NewClient("cool-token", "http://example.com")
 
 	// then
 	require.NoError(t, err)
@@ -56,9 +56,9 @@ func TestPatchUserSignup(t *testing.T) {
 	t.Run("update is successful", func(t *testing.T) {
 		//given
 		userSignup := NewUserSignup()
-		newClient, newRESTClient, fakeClient := NewFakeClients(t, userSignup)
+		newClient, fakeClient := NewFakeClients(t, userSignup)
 		term := NewFakeTerminal()
-		ctx := clicontext.NewCommandContext(term, newClient, newRESTClient)
+		ctx := clicontext.NewCommandContext(term, newClient)
 
 		// when
 		err := client.PatchUserSignup(ctx, userSignup.Name, func(signup *toolchainv1alpha1.UserSignup) (bool, error) {
@@ -75,9 +75,9 @@ func TestPatchUserSignup(t *testing.T) {
 	t.Run("UserSignup should not be updated", func(t *testing.T) {
 		//given
 		userSignup := NewUserSignup()
-		newClient, newRESTClient, fakeClient := NewFakeClients(t, userSignup)
+		newClient, fakeClient := NewFakeClients(t, userSignup)
 		term := NewFakeTerminal()
-		ctx := clicontext.NewCommandContext(term, newClient, newRESTClient)
+		ctx := clicontext.NewCommandContext(term, newClient)
 
 		// when
 		err := client.PatchUserSignup(ctx, userSignup.Name, func(signup *toolchainv1alpha1.UserSignup) (bool, error) {
@@ -93,9 +93,9 @@ func TestPatchUserSignup(t *testing.T) {
 	t.Run("change UserSignup func returns error", func(t *testing.T) {
 		//given
 		userSignup := NewUserSignup()
-		newClient, newRESTClient, fakeClient := NewFakeClients(t, userSignup)
+		newClient, fakeClient := NewFakeClients(t, userSignup)
 		term := NewFakeTerminal()
-		ctx := clicontext.NewCommandContext(term, newClient, newRESTClient)
+		ctx := clicontext.NewCommandContext(term, newClient)
 
 		// when
 		err := client.PatchUserSignup(ctx, userSignup.Name, func(signup *toolchainv1alpha1.UserSignup) (bool, error) {
@@ -111,12 +111,12 @@ func TestPatchUserSignup(t *testing.T) {
 	t.Run("get of UserSignup fails", func(t *testing.T) {
 		//given
 		userSignup := NewUserSignup()
-		newClient, newRESTClient, fakeClient := NewFakeClients(t, userSignup)
+		newClient, fakeClient := NewFakeClients(t, userSignup)
 		fakeClient.MockGet = func(ctx context.Context, key runtimeclient.ObjectKey, obj runtimeclient.Object, opts ...runtimeclient.GetOption) error {
 			return fmt.Errorf("some error")
 		}
 		term := NewFakeTerminal()
-		ctx := clicontext.NewCommandContext(term, newClient, newRESTClient)
+		ctx := clicontext.NewCommandContext(term, newClient)
 
 		// when
 		err := client.PatchUserSignup(ctx, userSignup.Name, func(signup *toolchainv1alpha1.UserSignup) (bool, error) {
@@ -131,12 +131,12 @@ func TestPatchUserSignup(t *testing.T) {
 	t.Run("update of UserSignup fails", func(t *testing.T) {
 		//given
 		userSignup := NewUserSignup()
-		newClient, newRESTClient, fakeClient := NewFakeClients(t, userSignup)
+		newClient, fakeClient := NewFakeClients(t, userSignup)
 		fakeClient.MockPatch = func(ctx context.Context, obj runtimeclient.Object, patch runtimeclient.Patch, opts ...runtimeclient.PatchOption) error {
 			return fmt.Errorf("some error")
 		}
 		term := NewFakeTerminal()
-		ctx := clicontext.NewCommandContext(term, newClient, newRESTClient)
+		ctx := clicontext.NewCommandContext(term, newClient)
 
 		// when
 		err := client.PatchUserSignup(ctx, userSignup.Name, func(signup *toolchainv1alpha1.UserSignup) (bool, error) {
@@ -157,8 +157,7 @@ func TestPatchUserSignup(t *testing.T) {
 		newClient := func(_, _ string) (runtimeclient.Client, error) {
 			return nil, fmt.Errorf("some error")
 		}
-		newRESTClient := client.DefaultNewRESTClient
-		ctx := clicontext.NewCommandContext(term, newClient, newRESTClient)
+		ctx := clicontext.NewCommandContext(term, newClient)
 
 		// when
 		err := client.PatchUserSignup(ctx, userSignup.Name, func(signup *toolchainv1alpha1.UserSignup) (bool, error) {
@@ -177,9 +176,9 @@ func TestUpdateUserSignupLacksPermissions(t *testing.T) {
 	SetFileConfig(t, Host(NoToken()))
 
 	userSignup := NewUserSignup()
-	newClient, newRESTClient, fakeClient := NewFakeClients(t, userSignup)
+	newClient, fakeClient := NewFakeClients(t, userSignup)
 	term := NewFakeTerminal()
-	ctx := clicontext.NewCommandContext(term, newClient, newRESTClient)
+	ctx := clicontext.NewCommandContext(term, newClient)
 
 	// when
 	err := client.PatchUserSignup(ctx, userSignup.Name, func(signup *toolchainv1alpha1.UserSignup) (bool, error) {
@@ -188,7 +187,7 @@ func TestUpdateUserSignupLacksPermissions(t *testing.T) {
 	}, "updated")
 
 	// then
-	require.EqualError(t, err, "sandbox command failed: the token in your ksctl.yaml file is missing")
+	require.EqualError(t, err, "ksctl command failed: the token in your ksctl.yaml file is missing")
 	AssertUserSignupSpec(t, fakeClient, userSignup)
 }
 

pkg/client/sandbox_config_file.go

@@ -5,7 +5,7 @@ import (
 	"path"
 )
 
-func EnsureSandboxCliConfigFile() (string, error) {
+func EnsureKsctlConfigFile() (string, error) {
 	home, err := os.UserHomeDir()
 	if err != nil {
 		return "", err

pkg/cmd/add_space_users.go

@@ -28,7 +28,7 @@ one or more users specified by their MasterUserRecord name. One SpaceBinding wil
 		Args: cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			term := ioutils.NewTerminal(cmd.InOrStdin, cmd.OutOrStdout)
-			ctx := clicontext.NewCommandContext(term, client.DefaultNewClient, client.DefaultNewRESTClient)
+			ctx := clicontext.NewCommandContext(term, client.DefaultNewClient)
 
 			return AddSpaceUsers(ctx, spaceName, role, users)
 		},
@@ -55,7 +55,7 @@ func AddSpaceUsers(ctx *clicontext.CommandContext, spaceName, role string, users
 
 	// get Space
 	ctx.Println("Checking space...")
-	space, err := client.GetSpace(cl, cfg.SandboxNamespace, spaceName)
+	space, err := client.GetSpace(cl, cfg.OperatorNamespace, spaceName)
 	if err != nil {
 		return err
 	}
@@ -85,7 +85,7 @@ func AddSpaceUsers(ctx *clicontext.CommandContext, spaceName, role string, users
 	ctx.Println("Checking users...")
 	spaceBindingsToCreate := []*toolchainv1alpha1.SpaceBinding{}
 	for _, murName := range usersToAdd {
-		mur, err := client.GetMasterUserRecord(cl, cfg.SandboxNamespace, murName)
+		mur, err := client.GetMasterUserRecord(cl, cfg.OperatorNamespace, murName)
 		if err != nil {
 			return err
 		}