Conditions

fastly/condition.go

@@ -52,7 +52,6 @@ func (c *Client) ListConditions(i *ListConditionsInput) ([]*Condition, error) {
 	if i.ServiceID == "" {
 		return nil, ErrMissingServiceID
 	}
-
 	if i.ServiceVersion == 0 {
 		return nil, ErrMissingServiceVersion
 	}
@@ -75,25 +74,24 @@ func (c *Client) ListConditions(i *ListConditionsInput) ([]*Condition, error) {
 // CreateConditionInput is used as input to the CreateCondition function.
 type CreateConditionInput struct {
 	// Name is the name of the condition.
-	Name string `url:"name,omitempty"`
+	Name *string `url:"name,omitempty"`
 	// Priority is a numeric string. Priority determines execution order. Lower numbers execute first.
 	Priority *int `url:"priority,omitempty"`
 	// ServiceID is the ID of the service (required).
-	ServiceID string
+	ServiceID string `url:"-"`
 	// ServiceVersion is the specific configuration version (required).
-	ServiceVersion int
+	ServiceVersion int `url:"-"`
 	// Statement is a conditional expression in VCL used to determine if the condition is met.
-	Statement string `url:"statement,omitempty"`
+	Statement *string `url:"statement,omitempty"`
 	// Type is the type of the condition (REQUEST, CACHE, RESPONSE, PREFETCH).
-	Type string `url:"type,omitempty"`
+	Type *string `url:"type,omitempty"`
 }
 
 // CreateCondition creates a new resource.
 func (c *Client) CreateCondition(i *CreateConditionInput) (*Condition, error) {
 	if i.ServiceID == "" {
 		return nil, ErrMissingServiceID
 	}
-
 	if i.ServiceVersion == 0 {
 		return nil, ErrMissingServiceVersion
 	}
@@ -114,7 +112,7 @@ func (c *Client) CreateCondition(i *CreateConditionInput) (*Condition, error) {
 
 // GetConditionInput is used as input to the GetCondition function.
 type GetConditionInput struct {
-	// Name is the name of the condition to fetch.
+	// Name is the name of the condition to fetch (required).
 	Name string
 	// ServiceID is the ID of the service (required).
 	ServiceID string
@@ -124,18 +122,16 @@ type GetConditionInput struct {
 
 // GetCondition retrieves the specified resource.
 func (c *Client) GetCondition(i *GetConditionInput) (*Condition, error) {
+	if i.Name == "" {
+		return nil, ErrMissingName
+	}
 	if i.ServiceID == "" {
 		return nil, ErrMissingServiceID
 	}
-
 	if i.ServiceVersion == 0 {
 		return nil, ErrMissingServiceVersion
 	}
 
-	if i.Name == "" {
-		return nil, ErrMissingName
-	}
-
 	path := fmt.Sprintf("/service/%s/version/%d/condition/%s", i.ServiceID, i.ServiceVersion, url.PathEscape(i.Name))
 	resp, err := c.Get(path, nil)
 	if err != nil {
@@ -154,14 +150,14 @@ func (c *Client) GetCondition(i *GetConditionInput) (*Condition, error) {
 type UpdateConditionInput struct {
 	// Comment is a freeform descriptive note.
 	Comment *string `url:"comment,omitempty"`
-	// Name is the name of the condition to update.
-	Name string
+	// Name is the name of the condition to update (required).
+	Name string `url:"-"`
 	// Priority is a numeric string. Priority determines execution order. Lower numbers execute first.
 	Priority *int `url:"priority,omitempty"`
 	// ServiceID is the ID of the service (required).
-	ServiceID string
+	ServiceID string `url:"-"`
 	// ServiceVersion is the specific configuration version (required).
-	ServiceVersion int
+	ServiceVersion int `url:"-"`
 	// Statement is a conditional expression in VCL used to determine if the condition is met.
 	Statement *string `url:"statement,omitempty"`
 	// Type is the type of the condition (REQUEST, CACHE, RESPONSE, PREFETCH).
@@ -170,18 +166,16 @@ type UpdateConditionInput struct {
 
 // UpdateCondition updates the specified resource.
 func (c *Client) UpdateCondition(i *UpdateConditionInput) (*Condition, error) {
+	if i.Name == "" {
+		return nil, ErrMissingName
+	}
 	if i.ServiceID == "" {
 		return nil, ErrMissingServiceID
 	}
-
 	if i.ServiceVersion == 0 {
 		return nil, ErrMissingServiceVersion
 	}
 
-	if i.Name == "" {
-		return nil, ErrMissingName
-	}
-
 	path := fmt.Sprintf("/service/%s/version/%d/condition/%s", i.ServiceID, i.ServiceVersion, url.PathEscape(i.Name))
 	resp, err := c.PutForm(path, i, nil)
 	if err != nil {
@@ -208,18 +202,16 @@ type DeleteConditionInput struct {
 
 // DeleteCondition deletes the specified resource.
 func (c *Client) DeleteCondition(i *DeleteConditionInput) error {
+	if i.Name == "" {
+		return ErrMissingName
+	}
 	if i.ServiceID == "" {
 		return ErrMissingServiceID
 	}
-
 	if i.ServiceVersion == 0 {
 		return ErrMissingServiceVersion
 	}
 
-	if i.Name == "" {
-		return ErrMissingName
-	}
-
 	path := fmt.Sprintf("/service/%s/version/%d/condition/%s", i.ServiceID, i.ServiceVersion, url.PathEscape(i.Name))
 	resp, err := c.Delete(path, nil)
 	if err != nil {

fastly/condition_test.go

@@ -19,9 +19,9 @@ func TestClient_Conditions(t *testing.T) {
 		condition, err = c.CreateCondition(&CreateConditionInput{
 			ServiceID:      testServiceID,
 			ServiceVersion: tv.Number,
-			Name:           "test/condition",
-			Statement:      "req.url~+\"index.html\"",
-			Type:           "REQUEST",
+			Name:           String("test/condition"),
+			Statement:      String("req.url~+\"index.html\""),
+			Type:           String("REQUEST"),
 			Priority:       Int(1),
 		})
 	})
@@ -161,81 +161,84 @@ func TestClient_CreateCondition_validation(t *testing.T) {
 
 func TestClient_GetCondition_validation(t *testing.T) {
 	var err error
+
 	_, err = testClient.GetCondition(&GetConditionInput{
-		ServiceID: "",
+		ServiceID:      "foo",
+		ServiceVersion: 1,
 	})
-	if err != ErrMissingServiceID {
+	if err != ErrMissingName {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = testClient.GetCondition(&GetConditionInput{
-		ServiceID:      "foo",
-		ServiceVersion: 0,
+		Name:           "test",
+		ServiceVersion: 1,
 	})
-	if err != ErrMissingServiceVersion {
+	if err != ErrMissingServiceID {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = testClient.GetCondition(&GetConditionInput{
-		ServiceID:      "foo",
-		ServiceVersion: 1,
-		Name:           "",
+		Name:      "test",
+		ServiceID: "foo",
 	})
-	if err != ErrMissingName {
+	if err != ErrMissingServiceVersion {
 		t.Errorf("bad error: %s", err)
 	}
 }
 
 func TestClient_UpdateCondition_validation(t *testing.T) {
 	var err error
+
 	_, err = testClient.UpdateCondition(&UpdateConditionInput{
-		ServiceID: "",
+		ServiceID:      "foo",
+		ServiceVersion: 1,
 	})
-	if err != ErrMissingServiceID {
+	if err != ErrMissingName {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = testClient.UpdateCondition(&UpdateConditionInput{
-		ServiceID:      "foo",
-		ServiceVersion: 0,
+		Name:           "test",
+		ServiceVersion: 1,
 	})
-	if err != ErrMissingServiceVersion {
+	if err != ErrMissingServiceID {
 		t.Errorf("bad error: %s", err)
 	}
 
 	_, err = testClient.UpdateCondition(&UpdateConditionInput{
-		ServiceID:      "foo",
-		ServiceVersion: 1,
-		Name:           "",
+		Name:      "test",
+		ServiceID: "foo",
 	})
-	if err != ErrMissingName {
+	if err != ErrMissingServiceVersion {
 		t.Errorf("bad error: %s", err)
 	}
 }
 
 func TestClient_DeleteCondition_validation(t *testing.T) {
 	var err error
+
 	err = testClient.DeleteCondition(&DeleteConditionInput{
-		ServiceID: "",
+		ServiceID:      "foo",
+		ServiceVersion: 1,
 	})
-	if err != ErrMissingServiceID {
+	if err != ErrMissingName {
 		t.Errorf("bad error: %s", err)
 	}
 
 	err = testClient.DeleteCondition(&DeleteConditionInput{
-		ServiceID:      "foo",
-		ServiceVersion: 0,
+		Name:           "test",
+		ServiceVersion: 1,
 	})
-	if err != ErrMissingServiceVersion {
+	if err != ErrMissingServiceID {
 		t.Errorf("bad error: %s", err)
 	}
 
 	err = testClient.DeleteCondition(&DeleteConditionInput{
-		ServiceID:      "foo",
-		ServiceVersion: 1,
-		Name:           "",
+		Name:      "test",
+		ServiceID: "foo",
 	})
-	if err != ErrMissingName {
+	if err != ErrMissingServiceVersion {
 		t.Errorf("bad error: %s", err)
 	}
 }

fastly/fastly_test.go

@@ -332,9 +332,9 @@ func createTestWAFCondition(t *testing.T, fixture, serviceID, name string, servi
 		condition, err = c.CreateCondition(&CreateConditionInput{
 			ServiceID:      serviceID,
 			ServiceVersion: serviceNumber,
-			Name:           name,
-			Statement:      "req.url~+\"index.html\"",
-			Type:           "PREFETCH", // This must be a prefetch condition
+			Name:           String(name),
+			Statement:      String("req.url~+\"index.html\""),
+			Type:           String("PREFETCH"), // This must be a prefetch condition
 			Priority:       Int(1),
 		})
 	})

fastly/fixtures/conditions/cleanup.yaml

@@ -6,13 +6,13 @@ interactions:
     form: {}
     headers:
       User-Agent:
-      - FastlyGo/5.1.2 (+github.com/fastly/go-fastly; go1.17.3)
-    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/74/condition/test%2Fcondition
+      - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15)
+    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/89/condition/test%2Fcondition
     method: DELETE
   response:
     body: '{"msg":"Record not found","detail":"Couldn''t find Condition ''{ deleted
       =\u003e 0000-00-00 00:00:00, name =\u003e test/condition, service =\u003e 7i6HN3TK9wS159v2gPAZ8A,
-      version =\u003e 74 }''"}'
+      version =\u003e 89 }''"}'
     headers:
       Accept-Ranges:
       - bytes
@@ -21,11 +21,11 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 26 Nov 2021 07:13:27 GMT
+      - Mon, 07 Nov 2022 12:32:13 GMT
       Fastly-Ratelimit-Remaining:
-      - "4989"
+      - "9979"
       Fastly-Ratelimit-Reset:
-      - "1637913600"
+      - "1667826000"
       Status:
       - 404 Not Found
       Strict-Transport-Security:
@@ -39,9 +39,9 @@ interactions:
       X-Cache-Hits:
       - 0, 0
       X-Served-By:
-      - cache-control-slwdc9037-CONTROL-SLWDC, cache-tyo11952-TYO
+      - cache-control-cp-aws-us-east-1-prod-5-CONTROL-AWS, cache-man4136-MAN
       X-Timer:
-      - S1637910808.571039,VS0,VE278
+      - S1667824333.179726,VS0,VE328
     status: 404 Not Found
     code: 404
     duration: ""

fastly/fixtures/conditions/create.yaml

@@ -2,12 +2,8 @@
 version: 1
 interactions:
 - request:
-    body: ServiceID=7i6HN3TK9wS159v2gPAZ8A&ServiceVersion=74&name=test%2Fcondition&priority=1&statement=req.url~%2B%22index.html%22&type=REQUEST
+    body: name=test%2Fcondition&priority=1&statement=req.url~%2B%22index.html%22&type=REQUEST
     form:
-      ServiceID:
-      - 7i6HN3TK9wS159v2gPAZ8A
-      ServiceVersion:
-      - "74"
       name:
       - test/condition
       priority:
@@ -20,11 +16,11 @@ interactions:
       Content-Type:
       - application/x-www-form-urlencoded
       User-Agent:
-      - FastlyGo/5.1.2 (+github.com/fastly/go-fastly; go1.17.3)
-    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/74/condition
+      - FastlyGo/6.8.0 (+github.com/fastly/go-fastly; go1.16.15)
+    url: https://api.fastly.com/service/7i6HN3TK9wS159v2gPAZ8A/version/89/condition
     method: POST
   response:
-    body: '{"name":"test/condition","priority":"1","statement":"req.url~+\"index.html\"","type":"REQUEST","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"74","comment":"","deleted_at":null,"created_at":"2021-11-26T07:13:25Z","updated_at":"2021-11-26T07:13:25Z"}'
+    body: '{"name":"test/condition","priority":"1","statement":"req.url~+\"index.html\"","type":"REQUEST","service_id":"7i6HN3TK9wS159v2gPAZ8A","version":"89","deleted_at":null,"created_at":"2022-11-07T12:32:11Z","comment":"","updated_at":"2022-11-07T12:32:11Z"}'
     headers:
       Accept-Ranges:
       - bytes
@@ -33,11 +29,11 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Fri, 26 Nov 2021 07:13:25 GMT
+      - Mon, 07 Nov 2022 12:32:11 GMT
       Fastly-Ratelimit-Remaining:
-      - "4992"
+      - "9982"
       Fastly-Ratelimit-Reset:
-      - "1637913600"
+      - "1667826000"
       Status:
       - 200 OK
       Strict-Transport-Security:
@@ -51,9 +47,9 @@ interactions:
       X-Cache-Hits:
       - 0, 0
       X-Served-By:
-      - cache-control-slwdc9036-CONTROL-SLWDC, cache-tyo11952-TYO
+      - cache-control-cp-aws-us-east-1-prod-1-CONTROL-AWS, cache-man4136-MAN
       X-Timer:
-      - S1637910805.308884,VS0,VE640
+      - S1667824332.511453,VS0,VE323
     status: 200 OK
     code: 200
     duration: ""