You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ra...@apache.org on 2018/10/26 20:38:04 UTC
[trafficcontrol] branch master updated (64e7ffa -> aacb65a)
This is an automated email from the ASF dual-hosted git repository.
rawlin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git.
from 64e7ffa Added documentation for the compare tool and route generator script
new 76b3342 Fix TO Go DSS to create location params
new aacb65a Fix TO Go DS, DSS to create urlsig params
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lib/go-tc/deliveryservices.go | 2 +-
lib/go-tc/enum.go | 2 +
.../deliveryservice/deliveryservicesv13.go | 62 +++++++-----
.../deliveryservice/servers/servers.go | 108 ++++++++++++++++++---
4 files changed, 134 insertions(+), 40 deletions(-)
[trafficcontrol] 02/02: Fix TO Go DS, DSS to create urlsig params
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rawlin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit aacb65a08098dc439a37de0eed31954016a54c70
Author: Robert Butts <ro...@apache.org>
AuthorDate: Fri Oct 19 16:34:16 2018 -0600
Fix TO Go DS, DSS to create urlsig params
Fixes #2919
---
lib/go-tc/deliveryservices.go | 2 +-
lib/go-tc/enum.go | 2 ++
.../deliveryservice/deliveryservicesv13.go | 23 ++++++++++++++++++----
.../deliveryservice/servers/servers.go | 11 +++++++----
4 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/lib/go-tc/deliveryservices.go b/lib/go-tc/deliveryservices.go
index 55e1cc8..504e957 100644
--- a/lib/go-tc/deliveryservices.go
+++ b/lib/go-tc/deliveryservices.go
@@ -391,7 +391,7 @@ func (ds *DeliveryServiceNullableV12) Validate(tx *sql.Tx) error {
func (ds *DeliveryServiceNullable) Sanitize() {
ds.DeliveryServiceNullableV12.Sanitize()
- signedAlgorithm := "url_sig"
+ signedAlgorithm := SigningAlgorithmURLSig
if ds.Signed && (ds.SigningAlgorithm == nil || *ds.SigningAlgorithm == "") {
ds.SigningAlgorithm = &signedAlgorithm
}
diff --git a/lib/go-tc/enum.go b/lib/go-tc/enum.go
index 943104f..cef0c72 100644
--- a/lib/go-tc/enum.go
+++ b/lib/go-tc/enum.go
@@ -137,6 +137,8 @@ func DSTypeCategoryFromString(s string) DSTypeCategory {
}
}
+const SigningAlgorithmURLSig = "url_sig"
+
// CacheStatus represents the Traffic Server status set in Traffic Ops (online, offline, admin_down, reported). The string values of this type should match the Traffic Ops values.
type CacheStatus string
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
index f1dfba5..c6be2d1 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
@@ -201,7 +201,7 @@ func create(tx *sql.Tx, cfg config.Config, user *auth.CurrentUser, ds tc.Deliver
ds.ExampleURLs = MakeExampleURLs(ds.Protocol, *ds.Type, *ds.RoutingName, *ds.MatchList, cdnDomain)
- if err := EnsureParams(tx, *ds.ID, *ds.XMLID, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, dsType); err != nil {
+ if err := EnsureParams(tx, *ds.ID, *ds.XMLID, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, ds.SigningAlgorithm, dsType); err != nil {
return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("ensuring ds parameters:: " + err.Error())
}
@@ -512,7 +512,7 @@ func update(tx *sql.Tx, cfg config.Config, user *auth.CurrentUser, ds *tc.Delive
}
}
- if err := EnsureParams(tx, *ds.ID, *ds.XMLID, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, dsType); err != nil {
+ if err := EnsureParams(tx, *ds.ID, *ds.XMLID, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, ds.SigningAlgorithm, dsType); err != nil {
return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("ensuring ds parameters:: " + err.Error())
}
@@ -605,7 +605,7 @@ func readGetDeliveryServices(params map[string]string, tx *sqlx.Tx, user *auth.C
if ds.DeepCachingType != nil {
*ds.DeepCachingType = tc.DeepCachingTypeFromString(string(*ds.DeepCachingType))
}
- ds.Signed = ds.SigningAlgorithm != nil && *ds.SigningAlgorithm == "url_sig"
+ ds.Signed = ds.SigningAlgorithm != nil && *ds.SigningAlgorithm == tc.SigningAlgorithmURLSig
dses = append(dses, ds)
}
@@ -786,7 +786,7 @@ const (
// EnsureParams ensures the given delivery service's necessary parameters exist on profiles of servers assigned to the delivery service.
// Note the edgeHeaderRewrite, midHeaderRewrite, regexRemap, and cacheURL may be nil, if the delivery service does not have those values.
-func EnsureParams(tx *sql.Tx, dsID int, xmlID string, edgeHeaderRewrite *string, midHeaderRewrite *string, regexRemap *string, cacheURL *string, dsType tc.DSType) error {
+func EnsureParams(tx *sql.Tx, dsID int, xmlID string, edgeHeaderRewrite *string, midHeaderRewrite *string, regexRemap *string, cacheURL *string, signingAlgorithm *string, dsType tc.DSType) error {
if err := ensureHeaderRewriteParams(tx, dsID, xmlID, edgeHeaderRewrite, edgeTier, dsType); err != nil {
return errors.New("creating edge header rewrite parameters: " + err.Error())
}
@@ -799,6 +799,9 @@ func EnsureParams(tx *sql.Tx, dsID int, xmlID string, edgeHeaderRewrite *string,
if err := ensureCacheURLParams(tx, dsID, xmlID, cacheURL); err != nil {
return errors.New("creating mid cacheurl parameters: " + err.Error())
}
+ if err := ensureURLSigParams(tx, dsID, xmlID, signingAlgorithm); err != nil {
+ return errors.New("creating urlsig parameters: " + err.Error())
+ }
return nil
}
@@ -833,6 +836,18 @@ ON CONFLICT DO NOTHING
return nil
}
+func ensureURLSigParams(tx *sql.Tx, dsID int, xmlID string, signingAlgorithm *string) error {
+ configFile := "url_sig_" + xmlID + ".config"
+ if signingAlgorithm == nil || *signingAlgorithm != tc.SigningAlgorithmURLSig {
+ return deleteLocationParam(tx, configFile)
+ }
+ locationParamID, err := ensureLocation(tx, configFile)
+ if err != nil {
+ return err
+ }
+ return createDSLocationProfileParams(tx, locationParamID, dsID)
+}
+
func ensureRegexRemapParams(tx *sql.Tx, dsID int, xmlID string, regexRemap *string) error {
configFile := "regex_remap_" + xmlID + ".config"
if regexRemap == nil || *regexRemap == "" {
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go
index 648966b..3f2b88a 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go
@@ -274,7 +274,7 @@ func GetReplaceHandler(w http.ResponseWriter, r *http.Request) {
respServers = append(respServers, server)
}
- if err := deliveryservice.EnsureParams(inf.Tx.Tx, *dsId, ds.Name, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, ds.Type); err != nil {
+ if err := deliveryservice.EnsureParams(inf.Tx.Tx, *dsId, ds.Name, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, ds.SigningAlgorithm, ds.Type); err != nil {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusInternalServerError, nil, errors.New("deliveryservice_server replace ensuring ds parameters: "+err.Error()))
return
}
@@ -340,7 +340,7 @@ func GetCreateHandler(w http.ResponseWriter, r *http.Request) {
return
}
- if err := deliveryservice.EnsureParams(inf.Tx.Tx, ds.ID, ds.Name, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, ds.Type); err != nil {
+ if err := deliveryservice.EnsureParams(inf.Tx.Tx, ds.ID, ds.Name, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, ds.SigningAlgorithm, ds.Type); err != nil {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusInternalServerError, nil, errors.New("deliveryservice_server replace ensuring ds parameters: "+err.Error()))
return
}
@@ -592,6 +592,7 @@ type DSInfo struct {
EdgeHeaderRewrite *string
MidHeaderRewrite *string
RegexRemap *string
+ SigningAlgorithm *string
CacheURL *string
}
@@ -604,6 +605,7 @@ SELECT
ds.edge_header_rewrite,
ds.mid_header_rewrite,
ds.regex_remap,
+ ds.signing_algorithm,
ds.cacheurl
FROM
deliveryservice ds
@@ -612,7 +614,7 @@ WHERE
ds.id = $1
`
di := DSInfo{ID: id}
- if err := tx.QueryRow(qry, id).Scan(&di.Name, &di.Type, &di.EdgeHeaderRewrite, &di.MidHeaderRewrite, &di.RegexRemap, &di.CacheURL); err != nil {
+ if err := tx.QueryRow(qry, id).Scan(&di.Name, &di.Type, &di.EdgeHeaderRewrite, &di.MidHeaderRewrite, &di.RegexRemap, &di.SigningAlgorithm, &di.CacheURL); err != nil {
if err == sql.ErrNoRows {
return DSInfo{}, false, nil
}
@@ -631,6 +633,7 @@ SELECT
ds.edge_header_rewrite,
ds.mid_header_rewrite,
ds.regex_remap,
+ ds.signing_algorithm,
ds.cacheurl
FROM
deliveryservice ds
@@ -639,7 +642,7 @@ WHERE
ds.xml_id = $1
`
di := DSInfo{Name: dsName}
- if err := tx.QueryRow(qry, dsName).Scan(&di.ID, &di.Type, &di.EdgeHeaderRewrite, &di.MidHeaderRewrite, &di.RegexRemap, &di.CacheURL); err != nil {
+ if err := tx.QueryRow(qry, dsName).Scan(&di.ID, &di.Type, &di.EdgeHeaderRewrite, &di.MidHeaderRewrite, &di.RegexRemap, &di.SigningAlgorithm, &di.CacheURL); err != nil {
if err == sql.ErrNoRows {
return DSInfo{}, false, nil
}
[trafficcontrol] 01/02: Fix TO Go DSS to create location params
Posted by ra...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rawlin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 76b33424b09ac9407097746e164256500ae06c17
Author: Robert Butts <ro...@apache.org>
AuthorDate: Fri Oct 19 14:27:27 2018 -0600
Fix TO Go DSS to create location params
Fixes #2918
---
.../deliveryservice/deliveryservicesv13.go | 45 ++++-----
.../deliveryservice/servers/servers.go | 105 +++++++++++++++++----
2 files changed, 112 insertions(+), 38 deletions(-)
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
index 3e2a64f..f1dfba5 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/deliveryservicesv13.go
@@ -201,18 +201,10 @@ func create(tx *sql.Tx, cfg config.Config, user *auth.CurrentUser, ds tc.Deliver
ds.ExampleURLs = MakeExampleURLs(ds.Protocol, *ds.Type, *ds.RoutingName, *ds.MatchList, cdnDomain)
- if err := ensureHeaderRewriteParams(tx, *ds.ID, *ds.XMLID, ds.EdgeHeaderRewrite, edgeTier, *ds.Type); err != nil {
- return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("creating edge header rewrite parameters: " + err.Error())
- }
- if err := ensureHeaderRewriteParams(tx, *ds.ID, *ds.XMLID, ds.MidHeaderRewrite, midTier, *ds.Type); err != nil {
- return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("creating mid header rewrite parameters: " + err.Error())
- }
- if err := ensureRegexRemapParams(tx, *ds.ID, *ds.XMLID, ds.RegexRemap); err != nil {
- return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("creating regex remap parameters: " + err.Error())
- }
- if err := ensureCacheURLParams(tx, *ds.ID, *ds.XMLID, ds.CacheURL); err != nil {
- return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("creating cache url parameters: " + err.Error())
+ if err := EnsureParams(tx, *ds.ID, *ds.XMLID, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, dsType); err != nil {
+ return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("ensuring ds parameters:: " + err.Error())
}
+
if dnssecEnabled {
if err := PutDNSSecKeys(tx, &cfg, *ds.XMLID, cdnName, ds.ExampleURLs); err != nil {
return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("creating DNSSEC keys: " + err.Error())
@@ -520,17 +512,8 @@ func update(tx *sql.Tx, cfg config.Config, user *auth.CurrentUser, ds *tc.Delive
}
}
- if err := ensureHeaderRewriteParams(tx, *ds.ID, *ds.XMLID, ds.EdgeHeaderRewrite, edgeTier, *ds.Type); err != nil {
- return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("creating edge header rewrite parameters: " + err.Error())
- }
- if err := ensureHeaderRewriteParams(tx, *ds.ID, *ds.XMLID, ds.MidHeaderRewrite, midTier, *ds.Type); err != nil {
- return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("creating mid header rewrite parameters: " + err.Error())
- }
- if err := ensureRegexRemapParams(tx, *ds.ID, *ds.XMLID, ds.RegexRemap); err != nil {
- return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("creating mid regex remap parameters: " + err.Error())
- }
- if err := ensureCacheURLParams(tx, *ds.ID, *ds.XMLID, ds.CacheURL); err != nil {
- return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("creating mid cacheurl parameters: " + err.Error())
+ if err := EnsureParams(tx, *ds.ID, *ds.XMLID, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, dsType); err != nil {
+ return tc.DeliveryServiceNullable{}, http.StatusInternalServerError, nil, errors.New("ensuring ds parameters:: " + err.Error())
}
if err := updatePrimaryOrigin(tx, user, *ds); err != nil {
@@ -801,6 +784,24 @@ const (
edgeTier
)
+// EnsureParams ensures the given delivery service's necessary parameters exist on profiles of servers assigned to the delivery service.
+// Note the edgeHeaderRewrite, midHeaderRewrite, regexRemap, and cacheURL may be nil, if the delivery service does not have those values.
+func EnsureParams(tx *sql.Tx, dsID int, xmlID string, edgeHeaderRewrite *string, midHeaderRewrite *string, regexRemap *string, cacheURL *string, dsType tc.DSType) error {
+ if err := ensureHeaderRewriteParams(tx, dsID, xmlID, edgeHeaderRewrite, edgeTier, dsType); err != nil {
+ return errors.New("creating edge header rewrite parameters: " + err.Error())
+ }
+ if err := ensureHeaderRewriteParams(tx, dsID, xmlID, midHeaderRewrite, midTier, dsType); err != nil {
+ return errors.New("creating mid header rewrite parameters: " + err.Error())
+ }
+ if err := ensureRegexRemapParams(tx, dsID, xmlID, regexRemap); err != nil {
+ return errors.New("creating mid regex remap parameters: " + err.Error())
+ }
+ if err := ensureCacheURLParams(tx, dsID, xmlID, cacheURL); err != nil {
+ return errors.New("creating mid cacheurl parameters: " + err.Error())
+ }
+ return nil
+}
+
func ensureHeaderRewriteParams(tx *sql.Tx, dsID int, xmlID string, hdrRW *string, tier tierType, dsType tc.DSType) error {
if tier == midTier && dsType.IsLive() && !dsType.IsNational() {
return nil // live local DSes don't get remap rules
diff --git a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go
index e6a00ce..648966b 100644
--- a/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go
+++ b/traffic_ops/traffic_ops_golang/deliveryservice/servers/servers.go
@@ -23,6 +23,7 @@ import (
"database/sql"
"encoding/json"
"errors"
+ "fmt"
"net/http"
"strconv"
@@ -239,7 +240,7 @@ func GetReplaceHandler(w http.ResponseWriter, r *http.Request) {
return
}
- xmlID, ok, err := deliveryservice.GetXMLID(inf.Tx.Tx, *dsId)
+ ds, ok, err := GetDSInfo(inf.Tx.Tx, *dsId)
if err != nil {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusInternalServerError, nil, errors.New("deliveryserviceserver getting XMLID: "+err.Error()))
return
@@ -248,7 +249,7 @@ func GetReplaceHandler(w http.ResponseWriter, r *http.Request) {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusBadRequest, errors.New("no delivery service with that ID exists"), nil)
return
}
- if userErr, sysErr, errCode := tenant.Check(inf.User, xmlID, inf.Tx.Tx); userErr != nil || sysErr != nil {
+ if userErr, sysErr, errCode := tenant.Check(inf.User, ds.Name, inf.Tx.Tx); userErr != nil || sysErr != nil {
api.HandleErr(w, r, inf.Tx.Tx, errCode, userErr, sysErr)
return
}
@@ -272,6 +273,12 @@ func GetReplaceHandler(w http.ResponseWriter, r *http.Request) {
}
respServers = append(respServers, server)
}
+
+ if err := deliveryservice.EnsureParams(inf.Tx.Tx, *dsId, ds.Name, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, ds.Type); err != nil {
+ api.HandleErr(w, r, inf.Tx.Tx, http.StatusInternalServerError, nil, errors.New("deliveryservice_server replace ensuring ds parameters: "+err.Error()))
+ return
+ }
+
api.WriteRespAlertObj(w, r, tc.SuccessLevel, "server assignements complete", tc.DSSMapResponse{*dsId, *payload.Replace, respServers})
}
@@ -291,19 +298,20 @@ func GetCreateHandler(w http.ResponseWriter, r *http.Request) {
}
defer inf.Close()
- if userErr, sysErr, errCode := tenant.Check(inf.User, inf.Params["xml_id"], inf.Tx.Tx); userErr != nil || sysErr != nil {
+ dsName := inf.Params["xml_id"]
+
+ if userErr, sysErr, errCode := tenant.Check(inf.User, dsName, inf.Tx.Tx); userErr != nil || sysErr != nil {
api.HandleErr(w, r, inf.Tx.Tx, errCode, userErr, sysErr)
return
}
- dsID := 0
- if err := inf.Tx.Tx.QueryRow(selectDeliveryService(), inf.Params["xml_id"]).Scan(&dsID); err != nil {
- if err == sql.ErrNoRows {
- api.HandleErr(w, r, inf.Tx.Tx, http.StatusNotFound, nil, errors.New("delivery service not found"))
- return
- }
+ ds, ok, err := GetDSInfoByName(inf.Tx.Tx, dsName)
+ if err != nil {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusInternalServerError, nil, errors.New("ds servers create scanning: "+err.Error()))
return
+ } else if !ok {
+ api.HandleErr(w, r, inf.Tx.Tx, http.StatusNotFound, nil, errors.New("delivery service not found"))
+ return
}
// get list of server Ids to insert
@@ -312,10 +320,10 @@ func GetCreateHandler(w http.ResponseWriter, r *http.Request) {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusBadRequest, errors.New("malformed JSON"), nil)
return
}
- payload.XmlId = inf.Params["xml_id"]
+ payload.XmlId = dsName
serverNames := payload.ServerNames
- res, err := inf.Tx.Tx.Exec(`INSERT INTO deliveryservice_server (deliveryservice, server) SELECT $1, id FROM server WHERE host_name = ANY($2::text[])`, dsID, pq.Array(serverNames))
+ res, err := inf.Tx.Tx.Exec(`INSERT INTO deliveryservice_server (deliveryservice, server) SELECT $1, id FROM server WHERE host_name = ANY($2::text[])`, ds.ID, pq.Array(serverNames))
if err != nil {
usrErr, sysErr, code := api.ParseDBError(err)
@@ -331,12 +339,13 @@ func GetCreateHandler(w http.ResponseWriter, r *http.Request) {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusNotFound, errors.New("servers not found"), nil)
return
}
- api.WriteResp(w, r, tc.DeliveryServiceServers{payload.ServerNames, payload.XmlId})
-}
-func selectDeliveryService() string {
- query := `SELECT id FROM deliveryservice WHERE xml_id = $1`
- return query
+ if err := deliveryservice.EnsureParams(inf.Tx.Tx, ds.ID, ds.Name, ds.EdgeHeaderRewrite, ds.MidHeaderRewrite, ds.RegexRemap, ds.CacheURL, ds.Type); err != nil {
+ api.HandleErr(w, r, inf.Tx.Tx, http.StatusInternalServerError, nil, errors.New("deliveryservice_server replace ensuring ds parameters: "+err.Error()))
+ return
+ }
+
+ api.WriteResp(w, r, tc.DeliveryServiceServers{payload.ServerNames, payload.XmlId})
}
func insertIdsQuery() string {
@@ -575,3 +584,67 @@ func updateQuery() string {
RETURNING last_updated`
return query
}
+
+type DSInfo struct {
+ ID int
+ Name string
+ Type tc.DSType
+ EdgeHeaderRewrite *string
+ MidHeaderRewrite *string
+ RegexRemap *string
+ CacheURL *string
+}
+
+// GetDSInfo loads the DeliveryService fields needed by Delivery Service Servers from the database, from the ID. Returns the data, whether the delivery service was found, and any error.
+func GetDSInfo(tx *sql.Tx, id int) (DSInfo, bool, error) {
+ qry := `
+SELECT
+ ds.xml_id,
+ tp.name as type,
+ ds.edge_header_rewrite,
+ ds.mid_header_rewrite,
+ ds.regex_remap,
+ ds.cacheurl
+FROM
+ deliveryservice ds
+ JOIN type tp ON ds.type = tp.id
+WHERE
+ ds.id = $1
+`
+ di := DSInfo{ID: id}
+ if err := tx.QueryRow(qry, id).Scan(&di.Name, &di.Type, &di.EdgeHeaderRewrite, &di.MidHeaderRewrite, &di.RegexRemap, &di.CacheURL); err != nil {
+ if err == sql.ErrNoRows {
+ return DSInfo{}, false, nil
+ }
+ return DSInfo{}, false, fmt.Errorf("querying delivery service server ds info '%v': %v", id, err)
+ }
+ di.Type = tc.DSTypeFromString(string(di.Type))
+ return di, true, nil
+}
+
+// GetDSInfoByName loads the DeliveryService fields needed by Delivery Service Servers from the database, from the ID. Returns the data, whether the delivery service was found, and any error.
+func GetDSInfoByName(tx *sql.Tx, dsName string) (DSInfo, bool, error) {
+ qry := `
+SELECT
+ ds.id,
+ tp.name as type,
+ ds.edge_header_rewrite,
+ ds.mid_header_rewrite,
+ ds.regex_remap,
+ ds.cacheurl
+FROM
+ deliveryservice ds
+ JOIN type tp ON ds.type = tp.id
+WHERE
+ ds.xml_id = $1
+`
+ di := DSInfo{Name: dsName}
+ if err := tx.QueryRow(qry, dsName).Scan(&di.ID, &di.Type, &di.EdgeHeaderRewrite, &di.MidHeaderRewrite, &di.RegexRemap, &di.CacheURL); err != nil {
+ if err == sql.ErrNoRows {
+ return DSInfo{}, false, nil
+ }
+ return DSInfo{}, false, fmt.Errorf("querying delivery service server ds info by name '%v': %v", dsName, err)
+ }
+ di.Type = tc.DSTypeFromString(string(di.Type))
+ return di, true, nil
+}