fix: single_origin was being ignored in manifest read

aziontech · May 29, 2024 · 71965d0 · 71965d0
1 parent f2428cf
commit 71965d0
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 14 deletions.
diff --git a/pkg/contracts/contracts.go b/pkg/contracts/contracts.go
@@ -177,10 +177,12 @@ type CacheSetting struct {
 }
 
 type Origin struct {
-	Name       string `json:"name"`
-	OriginType string `json:"origin_type,omitempty"`
-	Bucket     string `json:"bucket,omitempty"`
-	Prefix     string `json:"prefix,omitempty"`
+	Name       string                              `json:"name"`
+	OriginType string                              `json:"origin_type,omitempty"`
+	Bucket     string                              `json:"bucket,omitempty"`
+	Prefix     string                              `json:"prefix,omitempty"`
+	Addresses  []sdk.CreateOriginsRequestAddresses `json:"addresses,omitempty"`
+	HostHeader string                              `json:"host_header,omitempty"`
 }
 
 type RuleEngine struct {

diff --git a/pkg/manifest/request.go b/pkg/manifest/request.go
@@ -323,13 +323,25 @@ func makeRuleRequestCreate(rule contracts.RuleEngine, conf *contracts.AzionAppli
 func makeOriginCreateRequest(origin contracts.Origin, conf *contracts.AzionApplicationOptions) *apiOrigin.CreateRequest {
 	request := &apiOrigin.CreateRequest{}
 
-	request.SetBucket(conf.Bucket)
+	switch origin.OriginType {
+	case "single_origin":
+		if origin.HostHeader != "" {
+			request.SetHostHeader(origin.HostHeader)
+		}
+		if len(origin.Addresses) > 0 {
+			request.SetAddresses(origin.Addresses)
+		}
+
+	case "object_storage":
+		request.SetBucket(conf.Bucket)
 
-	if origin.Prefix != "" {
-		request.SetPrefix(origin.Prefix)
-	} else {
-		request.SetPrefix(conf.Prefix)
+		if origin.Prefix != "" {
+			request.SetPrefix(origin.Prefix)
+		} else {
+			request.SetPrefix(conf.Prefix)
+		}
 	}
+
 	if origin.OriginType != "" {
 		request.SetOriginType(origin.OriginType)
 	}
@@ -340,13 +352,25 @@ func makeOriginCreateRequest(origin contracts.Origin, conf *contracts.AzionAppli
 func makeOriginUpdateRequest(origin contracts.Origin, conf *contracts.AzionApplicationOptions) *apiOrigin.UpdateRequest {
 	request := &apiOrigin.UpdateRequest{}
 
-	request.SetBucket(conf.Bucket)
+	switch origin.OriginType {
+	case "single_origin":
+		if origin.HostHeader != "" {
+			request.SetHostHeader(origin.HostHeader)
+		}
+		if len(origin.Addresses) > 0 {
+			request.SetAddresses(origin.Addresses)
+		}
+
+	case "object_storage":
+		request.SetBucket(conf.Bucket)
 
-	if origin.Prefix != "" {
-		request.SetPrefix(origin.Prefix)
-	} else {
-		request.SetPrefix(conf.Prefix)
+		if origin.Prefix != "" {
+			request.SetPrefix(origin.Prefix)
+		} else {
+			request.SetPrefix(conf.Prefix)
+		}
 	}
+
 	if origin.OriginType != "" {
 		request.SetOriginType(origin.OriginType)
 	}