feat: Release/v2.1.16

cmd/kubectl-testkube/commands/context/set.go

@@ -52,7 +52,7 @@ func NewSetContextCmd() *cobra.Command {
 					var err error
 					cfg, err = common.PopulateOrgAndEnvNames(cfg, opts.Master.OrgId, opts.Master.EnvId, opts.Master.URIs.Api)
 					if err != nil {
-						ui.Errf("Error populating org and env names: %s", err)
+						ui.Failf("Error populating org and env names: %s", err)
 					}
 				} else {
 					ui.Warn("No API key provided, you need to login to Testkube Cloud")
@@ -76,9 +76,10 @@ func NewSetContextCmd() *cobra.Command {
 				common.UiCloudContextValidationError(err)
 			}
 
-			common.UiPrintContext(cfg)
-			ui.NL()
 			ui.Success("Your config was updated with new values")
+			ui.NL()
+			common.UiPrintContext(cfg)
+
 		},
 	}
 

pkg/repository/config/mongo_test.go

@@ -14,16 +14,12 @@ import (
 	"github.com/kubeshop/testkube/pkg/api/v1/testkube"
 )
 
-const (
-	mongoDbName = "testkube-test"
-)
-
 var (
 	cfg, _ = config.Get()
 )
 
-func getRepository() (*MongoRepository, error) {
-	db, err := storage.GetMongoDatabase(cfg.APIMongoDSN, mongoDbName, storage.TypeMongoDB, false, nil)
+func getRepository(dbName string) (*MongoRepository, error) {
+	db, err := storage.GetMongoDatabase(cfg.APIMongoDSN, dbName, storage.TypeMongoDB, false, nil)
 	repository := NewMongoRepository(db)
 	return repository, err
 }
@@ -33,13 +29,13 @@ func TestStorage_Integration(t *testing.T) {
 
 	assert := require.New(t)
 
-	repository, err := getRepository()
-	assert.NoError(err)
-
-	err = repository.Coll.Drop(context.TODO())
-	assert.NoError(err)
-
 	t.Run("GetUniqueClusterId should return same id for each call", func(t *testing.T) {
+		repository, err := getRepository("testkube-test-generate-id")
+		t.Cleanup(func() {
+			err := repository.Coll.Drop(context.Background())
+			assert.NoError(err)
+		})
+		assert.NoError(err)
 		// given/when
 		id1, err := repository.GetUniqueClusterId(context.Background())
 		assert.NoError(err)
@@ -57,9 +53,15 @@ func TestStorage_Integration(t *testing.T) {
 	})
 
 	t.Run("Upsert should insert new config entry", func(t *testing.T) {
+		repository, err := getRepository("testkube-test-insert-cluster-id")
+		t.Cleanup(func() {
+			err := repository.Coll.Drop(context.Background())
+			assert.NoError(err)
+		})
+		assert.NoError(err)
 		// given,
 		clusterId := "uniq3"
-		_, err := repository.Upsert(context.Background(), testkube.Config{
+		_, err = repository.Upsert(context.Background(), testkube.Config{
 			ClusterId: clusterId,
 		})
 		assert.NoError(err)