Merge pull request #621 from kthcloud/dev

Maintenance Update

.github/workflows/run-tests.yml

@@ -13,58 +13,31 @@ on:
       - '.github/workflows/run-tests.yml'
 
 jobs:
-  acc:
+  tests:
     runs-on: ubuntu-latest
-
     steps:
       - name: Check out code
         uses: actions/checkout@v3
 
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: '>=1.20.0'
-
-      - name: Create config directory
-        run: sudo mkdir -p /etc/deploy && sudo chown $USER /etc/deploy
+          go-version: '>=1.21.0'
 
-      - name: Create config file from secret
+      - name: Install local environment
+        id: setup-local
         run: |
-          echo "${{ vars.CONFIG_FILE }}" | sudo tee /etc/deploy/config.yaml > /dev/null
+          cd scripts/local
+          chmod +x ./setup.sh && ./setup.sh -y --configure-dns
+          cd ../..
+          ls -la
 
       - name: Export configuration file path
-        run: echo "DEPLOY_CONFIG_FILE=/etc/deploy/config.yaml" >> $GITHUB_ENV
+        run: echo "DEPLOY_CONFIG_FILE=config.local.yml" >> $GITHUB_ENV
 
       - name: Run acceptance tests
-        run: go test -timeout 30m ./test/acc/...
-  e2e:
-    runs-on: ubuntu-latest
-
-    # This assumes that the configuration file connects to Redis at localhost:6379
-    services:
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '>=1.20.0'
-
-      - name: Create config directory
-        run: sudo mkdir -p /etc/deploy && sudo chown $USER /etc/deploy
-
-      - name: Create config file from secret
         run: |
-          echo "${{ vars.CONFIG_FILE }}" | sudo tee /etc/deploy/config.yaml > /dev/null
-
-      - name: Export configuration file path
-        run: echo "DEPLOY_CONFIG_FILE=/etc/deploy/config.yaml" >> $GITHUB_ENV
+          go test -timeout 30m ./test/acc/...
 
       - name: Start main program
         run: |
@@ -79,4 +52,4 @@ jobs:
 
       - name: Run e2e tests
         run: go test -timeout 30m ./test/e2e/...
-
+        

.gitignore

@@ -32,7 +32,7 @@ scripts/local/config/
 scripts/local/go-deploy-placeholder/
 
 # Generated by scripts/setup.sh
-config-local.yml
+config.local.yml
 
 # Caches kubeconfig
 cache/

cmd/server.go

@@ -55,13 +55,13 @@ func Create(opts *Options) *App {
 		{Name: "Validate application", Task: func() error { return validateApp(opts) }},
 		{Name: "Setup environment", Task: func() error { return config.SetupEnvironment(opts.Mode) }},
 		{Name: "Setup metrics", Task: metrics.Setup},
-		{Name: "Enable test mode if requested", Task: enableTestIfRequested},
 		{Name: "Setup database", Task: db.Setup},
 		{Name: "Clean up old tests", Task: intializer.CleanUpOldTests},
 		{Name: "Synchronize VM ports", Task: intializer.SynchronizeVmPorts},
 		{Name: "Run migrations", Task: migrator.Migrate},
 		{Name: "Reset running jobs", Task: func() error { return job_repo.New().ResetRunning() }},
 		{Name: "Ensure system deployments exists", Task: intializer.EnsureSystemDeploymentsExists},
+		{Name: "Ensure test users exist", Task: intializer.EnsureTestUsersExist},
 	}
 
 	for idx, task := range initTasks {
@@ -195,12 +195,3 @@ func validateApp(options *Options) error {
 
 	return nil
 }
-
-func enableTestIfRequested() error {
-	if config.Config.Mode == mode.Test {
-		log.Printf("%sRUNNING IN TEST MODE. NO AUTHENTICATION WILL BE REQUIRED%s", log.Bold, log.Reset)
-		config.Config.MongoDB.Name = config.Config.MongoDB.Name + "-test"
-	}
-
-	return nil
-}

models/config/config.go

@@ -18,7 +18,9 @@ const (
 type ConfigType struct {
 	Port        int    `yaml:"port"`
 	ExternalUrl string `yaml:"externalUrl"`
-	Mode        string `yaml:"mode"`
+	// Mode is the mode in which the application is running
+	// It is set using the command line flag --mode
+	Mode string
 	// Filepath is the path to the configuration file
 	// It is set by the SetupEnvironment function when the configuration is loaded
 	Filepath string

models/model/deployment_params.go

@@ -41,6 +41,7 @@ type DeploymentUpdateParams struct {
 }
 
 type DeploymentUpdateOwnerParams struct {
-	NewOwnerID string
-	OldOwnerID string
+	NewOwnerID    string
+	OldOwnerID    string
+	MigrationCode *string
 }

models/model/deployment_related.go

@@ -18,6 +18,10 @@ const (
 	LogSourceBuild = "build"
 )
 
+var (
+	EmptyReplicaStatus = &ReplicaStatus{}
+)
+
 type App struct {
 	Name string `bson:"name"`
 

models/model/user.go

@@ -11,6 +11,16 @@ var (
 	FetchGravatarInterval = 10 * time.Minute
 )
 
+const (
+	TestAdminUserID   = "955f0f87-37fd-4792-90eb-9bf6989e698a"
+	TestPowerUserID   = "955f0f87-37fd-4792-90eb-9bf6989e698b"
+	TestDefaultUserID = "955f0f87-37fd-4792-90eb-9bf6989e698c"
+
+	TestAdminUserApiKey   = "test-api-key-admin"
+	TestPowerUserApiKey   = "test-api-key-power"
+	TestDefaultUserApiKey = "test-api-key-default"
+)
+
 type User struct {
 	ID        string   `bson:"id"`
 	Username  string   `bson:"username"`
@@ -22,9 +32,9 @@ type User struct {
 	IsAdmin       bool          `bson:"isAdmin"`
 	EffectiveRole EffectiveRole `bson:"effectiveRole"`
 
-	PublicKeys []PublicKey `bson:"publicKeys"`
-	ApiKeys    []ApiKey    `bson:"apiKeys"`
-	UserData   []UserData  `bson:"userData"`
+	PublicKeys []PublicKey `bson:"publicKeys,omitempty"`
+	ApiKeys    []ApiKey    `bson:"apiKeys,omitempty"`
+	UserData   []UserData  `bson:"userData,omitempty"`
 
 	LastAuthenticatedAt time.Time `bson:"lastAuthenticatedAt"`
 }

models/model/vm_params.go

@@ -29,8 +29,9 @@ type VmUpdateParams struct {
 }
 
 type VmUpdateOwnerParams struct {
-	NewOwnerID string
-	OldOwnerID string
+	NewOwnerID    string
+	OldOwnerID    string
+	MigrationCode *string
 }
 
 type VmActionParams struct {