MM-60336: Allow ability to create empty OS

https://mattermost.atlassian.net/browse/MM-60336
mattermost · Dec 13, 2024 · d6609d5 · d6609d5
1 parent cacf82f
commit d6609d5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/deployment/config.go b/deployment/config.go
@@ -464,14 +464,6 @@ func (c *Config) validateElasticSearchConfig() error {
 		return fmt.Errorf("Incorrect engine version: %s. Must start with %q", c.ElasticSearchSettings.Version, "OpenSearch")
 	}
 
-	if c.ElasticSearchSettings.SnapshotRepository == "" {
-		return fmt.Errorf("Empty SnapshotRepository. Must supply a value")
-	}
-
-	if c.ElasticSearchSettings.SnapshotName == "" {
-		return fmt.Errorf("Empty SnapshotName. Must supply a value")
-	}
-
 	return nil
 }
 

diff --git a/deployment/terraform/create.go b/deployment/terraform/create.go
@@ -540,6 +540,11 @@ func (t *Terraform) setupElasticSearchServer(extAgent *ssh.ExtAgent, ip string)
 	mlog.Debug("Repositories registered", mlog.Array("repositories", repositories))
 
 	repo := esSettings.SnapshotRepository
+	snapshotName := esSettings.SnapshotName
+	if snapshotName == "" {
+		mlog.Debug("No Opensearch snapshot name given. Not restoring to any snapshot.")
+		return nil
+	}
 
 	// Check if the registered repositories already include the one configured
 	repoFound := false
@@ -568,7 +573,6 @@ func (t *Terraform) setupElasticSearchServer(extAgent *ssh.ExtAgent, ip string)
 
 	// Look for the configured snapshot
 	var snapshot opensearch.Snapshot
-	snapshotName := esSettings.SnapshotName
 	for _, s := range snapshots {
 		if s.Name == snapshotName {
 			snapshot = s