Merge branch 'main' of github.com:kosli-dev/cli into install-script

Author: sofusalbertsen

.github/workflows/release.yml

@@ -221,7 +221,7 @@ jobs:
 
   evidence-reporter-upload-package-and-deploy:
     needs: [pre-build, goreleaser]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@v2
@@ -233,7 +233,7 @@ jobs:
 
   environment-reporter-upload-package-and-deploy:
     needs: [pre-build, goreleaser]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Repository Dispatch
         uses: peter-evans/repository-dispatch@v2

Makefile

@@ -82,6 +82,19 @@ test_setup_restart_server: ensure_gotestsum
 	@test -f /tmp/server-image.txt || ./hack/get-server-image.sh /tmp/server-image.txt
 	export KOSLI_SERVER_IMAGE=$$(cat /tmp/server-image.txt) && ./bin/reset-or-start-server.sh force
 
+setup_test_to_use_local_image:
+	@echo merkely > /tmp/server-image.txt
+	@docker ps -aq | xargs -r docker rm -fv
+	@echo "Run make build in the server repo you want to use"
+	@echo "Then run make test_integration"
+	@echo "To look at the logs from local kosli server run: make follow_integration_test_server"
+
+setup_test_to_use_staging_server_image:
+	@rm /tmp/server-image.txt
+	@docker ps -aq | xargs -r docker rm -fv
+	@echo "Now run make test_integration"
+	@echo "To look at the logs from kosli server run: make follow_integration_test_server"
+
 test_integration: deps vet ensure_network test_setup ## Run tests except the too slow ones
 	@[ -e ~/.kosli.yml ] && mv ~/.kosli.yml ~/.kosli-renamed.yml || true
 	@export KOSLI_TESTS=true && $(GOTESTSUM) -- --short -p=8 -coverprofile=cover.out ./...
@@ -110,6 +123,12 @@ test_integration_single: test_setup
 test_docs: deps vet ensure_network test_setup
 	./bin/test_docs_cmds.sh docs.kosli.com/content/use_cases/simulating_a_devops_system/_index.md
 
+logs_integration_test_server:
+	@docker logs cli_kosli_server ${CONTAINER} 2>&1
+
+follow_integration_test_server:
+	@docker logs cli_kosli_server -f ${CONTAINER} 2>&1
+
 
 docker:
 	@docker build -t kosli-cli .

cmd/kosli/createEnvironment_test.go

@@ -100,7 +100,7 @@ func (suite *CreateEnvironmentCommandTestSuite) TestCreateEnvironmentCmd() {
 			wantError: true,
 			name:      "fails when name is considered invalid by the server",
 			cmd:       "create env 'foo bar' --type K8S" + suite.defaultKosliArguments,
-			golden:    "Error: Input payload validation failed: map[name:'foo bar' does not match '^[a-zA-Z0-9][a-zA-Z0-9\\\\.\\\\-_~]*$']\n",
+			golden:    "Error: Input payload validation failed: map[name:'foo bar' does not match '^[a-zA-Z0-9][a-zA-Z0-9\\\\.\\\\-_]*$']\n",
 		},
 		{
 			wantError: false,

cmd/kosli/multiHost.go

@@ -59,7 +59,7 @@ func runMultiHost(args []string) (string, error) {
 		errorMessage += err0.Error()
 	}
 
-	for i:=1; i < len(opts.hosts); i++ {
+	for i := 1; i < len(opts.hosts); i++ {
 		argsN := argsAppendHostApiTokenFlags(i)
 		outputN, errN := runBufferedInnerMain(argsN)
 
@@ -75,7 +75,7 @@ func runMultiHost(args []string) (string, error) {
 			errorMessage += fmt.Sprintf("\n%s", errN.Error())
 		}
 	}
-	
+
 	var err error
 	if errorMessage != "" {
 		err = errors.New(errorMessage)

cmd/kosli/multiHost_test.go

@@ -121,7 +121,6 @@ func (suite *MultiHostTestSuite) TestRunDoubledHost() {
 			stdOut: []string{"OK", ""},
 			err:    error(nil),
 		},
-		
 	} {
 		defer func(original []string) { os.Args = original }(os.Args)
 		os.Args = t.args
@@ -157,7 +156,6 @@ func (suite *MultiHostTestSuite) TestRunTripledHost() {
 			stdOut: []string{"OK", ""},
 			err:    error(nil),
 		},
-		
 	} {
 		defer func(original []string) { os.Args = original }(os.Args)
 		os.Args = t.args
@@ -261,21 +259,21 @@ func charAt(s string, n int) string {
 	return fmt.Sprintf("%v", c)
 }
 
-		// {
-		// 	name:   "in debug mode also returns secondary call output",
-		// 	args:   doubledArgs([]string{"kosli", "status", "--debug"}),
-		// 	stdOut: StatusDebugLines(),
-		// 	err:    error(nil),
-		// },
-		// {
-		// 	name:   "--help prints output once",
-		// 	args:   doubledArgs([]string{"kosli", "status", "--help"}),
-		// 	stdOut: HelpStatusLines(),
-		// 	err:    error(nil),
-		// },
-		// {
-		// 	name:   "bad-flag never gets to call runMultiHost() because isMultiHost() returns false",
-		// 	args:   doubledArgs([]string{"kosli", "status", "--bad-flag"}),
-		// 	stdOut: BadFlagLines(),
-		// 	err:    error(nil),
-		// },
+// {
+// 	name:   "in debug mode also returns secondary call output",
+// 	args:   doubledArgs([]string{"kosli", "status", "--debug"}),
+// 	stdOut: StatusDebugLines(),
+// 	err:    error(nil),
+// },
+// {
+// 	name:   "--help prints output once",
+// 	args:   doubledArgs([]string{"kosli", "status", "--help"}),
+// 	stdOut: HelpStatusLines(),
+// 	err:    error(nil),
+// },
+// {
+// 	name:   "bad-flag never gets to call runMultiHost() because isMultiHost() returns false",
+// 	args:   doubledArgs([]string{"kosli", "status", "--bad-flag"}),
+// 	stdOut: BadFlagLines(),
+// 	err:    error(nil),
+// },

cmd/kosli/renameEnvironment_test.go

@@ -39,7 +39,7 @@ func (suite *RenameEnvironmentCommandTestSuite) TestRenameEnvironmentCmd() {
 			wantError: true,
 			name:      "renaming environment fails if the new name is illegal",
 			cmd:       fmt.Sprintf(`rename environment %s 'new illegal name' %s`, suite.envName, suite.defaultKosliArguments),
-			golden:    "Error: 'new illegal name' is an invalid name for environments. Valid names should start with an alphanumeric and only contain alphanumeric characters, '.', '-', '_' and '~'.\n",
+			golden:    "Error: 'new illegal name' is an invalid name for environments. Valid names should start with an alphanumeric and only contain alphanumeric characters, '.', '-' and '_'.\n",
 		},
 		{
 			wantError: true,

docs.kosli.com/layouts/partials/docs/html-head.html

@@ -68,10 +68,6 @@
   <script defer src="{{ $swJS.RelPermalink }}" {{ template "integrity" $swJS }}></script>
 {{ end -}}
 
-<!-- Fathom - beautiful, simple website analytics -->
-<script src="https://cdn.usefathom.com/script.js" data-site="AUFUAQWT" data-excluded-domains="localhost" defer></script>
-<!-- / Fathom -->
-
 {{ if in .Permalink "/legacy_ref" }}
 <meta name="robots" content="noindex">
 {{ end }}