Add persistence domain config validation check (#2286)

uber · Jul 26, 2019 · 2615acf · 2615acf
1 parent f6bbaf8
commit 2615acf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/service/frontend/domainAttrValidator.go b/service/frontend/domainAttrValidator.go
@@ -46,12 +46,16 @@ func newDomainAttrValidator(
 	}
 }
 
-func (d *domainAttrValidatorImpl) validateDomainConfig(
-	config *persistence.DomainConfig,
-) error {
+func (d *domainAttrValidatorImpl) validateDomainConfig(config *persistence.DomainConfig) error {
 	if config.Retention < int32(d.minRetentionDays) {
 		return errInvalidRetentionPeriod
 	}
+	if config.HistoryArchivalStatus == shared.ArchivalStatusEnabled && len(config.HistoryArchivalURI) == 0 {
+		return errInvalidArchivalConfig
+	}
+	if config.VisibilityArchivalStatus == shared.ArchivalStatusEnabled && len(config.VisibilityArchivalURI) == 0 {
+		return errInvalidArchivalConfig
+	}
 	return nil
 }
 

diff --git a/service/frontend/workflowHandler.go b/service/frontend/workflowHandler.go
@@ -119,6 +119,7 @@ var (
 	errInvalidTaskStartToCloseTimeoutSeconds      = &gen.BadRequestError{Message: "A valid TaskStartToCloseTimeoutSeconds is not set on request."}
 	errClientVersionNotSet                        = &gen.BadRequestError{Message: "Client version is not set on request."}
 	errInvalidRetentionPeriod                     = &gen.BadRequestError{Message: "A valid retention period is not set on request."}
+	errInvalidArchivalConfig                      = &gen.BadRequestError{Message: "Invalid to enable archival without specifying a uri."}
 
 	// err for archival
 	errHistoryHasPassedRetentionPeriod = &gen.BadRequestError{Message: "Requested workflow history has passed retention period."}