Merge pull request #93 from phillc/cleanup

Cleanup
linode · Sep 30, 2019 · 1b21bc4 · 1b21bc4
2 parents be0c109 + ab94b7a
commit 1b21bc4
Show file tree

Hide file tree

Showing 108 changed files with 491 additions and 464 deletions.
diff --git a/Makefile b/Makefile
@@ -9,6 +9,7 @@ GOLANGCILINT_WARN_ARGS := run --no-config --issues-exit-code=0 --disable-all --e
 test: build lint
 	@LINODE_FIXTURE_MODE="play" \
 	LINODE_TOKEN="awesometokenawesometokenawesometoken" \
+	LINODE_API_VERSION="v4beta" \
 	GO111MODULE="on" \
 	go test $(ARGS)
 
@@ -31,8 +32,11 @@ refresh-fixtures: clean-fixtures fixtures
 
 run_fixtures:
 	@echo "* Running fixtures"
-	@LINODE_TOKEN=$(LINODE_TOKEN) \
-	LINODE_FIXTURE_MODE="record" go test $(ARGS)
+	@LINODE_FIXTURE_MODE="record" \
+	LINODE_TOKEN=$(LINODE_TOKEN) \
+	LINODE_API_VERSION="v4beta" \
+	GO111MODULE="on" \
+	go test $(ARGS)
 
 sanitize:
 	@echo "* Santizing fixtures"

diff --git a/client.go b/client.go
diff --git a/example_test.go b/example_test.go
@@ -52,7 +52,7 @@ func ExampleClient_GetType_missing() {
 	}
 
 	// Output:
-	// Request was: https://api.linode.com/v4/linode/types/missing-type
+	// Request was: https://api.linode.com/v4beta/linode/types/missing-type
 	// Response was: 404 NOT FOUND
 	// Error was: [404] Not found
 }
@@ -184,7 +184,7 @@ func ExampleClient_GetImage_missing() {
 	}
 
 	// Output:
-	// Request was: https://api.linode.com/v4/images/not-found
+	// Request was: https://api.linode.com/v4beta/images/not-found
 	// Response was: 404 NOT FOUND
 	// Error was: [404] Not found
 }

diff --git a/fixtures/Example.yaml b/fixtures/Example.yaml
@@ -13,7 +13,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances/1231
+    url: https://api.linode.com/v4beta/linode/instances/1231
     method: GET
   response:
     body: '{"errors": [{"reason": "Not found"}]}'
@@ -69,7 +69,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances
+    url: https://api.linode.com/v4beta/linode/instances
     method: GET
   response:
     body: '{"data": [{"region": "us-east", "alerts": {"network_in": 10, "network_out":
@@ -149,7 +149,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances/76859403
+    url: https://api.linode.com/v4beta/linode/instances/76859403
     method: GET
   response:
     body: '{"image": "linode/ubuntu18.04", "group": "", "updated": "2018-01-02T03:04:05",
@@ -228,7 +228,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances/76859403/configs
+    url: https://api.linode.com/v4beta/linode/instances/76859403/configs
     method: GET
   response:
     body: '{"results": 1, "data": [{"memory_limit": 0, "kernel": "linode/grub2", "label":
@@ -308,7 +308,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances/76859403/configs/9958462
+    url: https://api.linode.com/v4beta/linode/instances/76859403/configs/9958462
     method: GET
   response:
     body: '{"initrd": null, "kernel": "linode/grub2", "devices": {"sdh": null, "sdf":
@@ -387,7 +387,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances/76859403/disks
+    url: https://api.linode.com/v4beta/linode/instances/76859403/disks
     method: GET
   response:
     body: '{"pages": 1, "page": 1, "data": [{"updated": "2018-01-02T03:04:05", "label":
@@ -463,7 +463,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances/76859403/disks/18974977
+    url: https://api.linode.com/v4beta/linode/instances/76859403/disks/18974977
     method: GET
   response:
     body: '{"created": "2018-01-02T03:04:05", "id": 18974977, "filesystem": "ext4",
@@ -537,7 +537,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances/76859403/backups
+    url: https://api.linode.com/v4beta/linode/instances/76859403/backups
     method: GET
   response:
     body: '{"snapshot": {"in_progress": null, "current": {"configs": ["My Ubuntu 18.04
@@ -615,7 +615,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances/76859403/backups/96509901
+    url: https://api.linode.com/v4beta/linode/instances/76859403/backups/96509901
     method: GET
   response:
     body: '{"label": "test-snapshot", "region": "us-east", "status": "successful",
@@ -691,7 +691,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/instances/76859403/volumes
+    url: https://api.linode.com/v4beta/linode/instances/76859403/volumes
     method: GET
   response:
     body: '{"results": 1, "data": [{"created": "2018-01-02T03:04:05", "id": 6574839201,
@@ -766,7 +766,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/volumes/6574839201
+    url: https://api.linode.com/v4beta/volumes/6574839201
     method: GET
   response:
     body: '{"filesystem_path": "/dev/disk/by-id/scsi-0Linode_Volume_test-volume",
@@ -843,7 +843,7 @@ interactions:
       - linodego 0.0.1 https://github.com/linode/linodego
       X-Filter:
       - '{"mine":true}'
-    url: https://api.linode.com/v4/linode/stackscripts
+    url: https://api.linode.com/v4beta/linode/stackscripts
     method: GET
   response:
     body: '{"pages": 1, "page": 1, "data": [{"script": "#!/bin/bash\n# <UDF name=\"gh_username\"

diff --git a/fixtures/ExampleCreateNodeBalancer.yaml b/fixtures/ExampleCreateNodeBalancer.yaml
@@ -13,7 +13,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers
+    url: https://api.linode.com/v4beta/nodebalancers
     method: POST
   response:
     body: '{"region": "us-east", "created": "2018-01-02T03:04:05", "updated": "2018-01-02T03:04:05",
@@ -86,7 +86,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36396
+    url: https://api.linode.com/v4beta/nodebalancers/36396
     method: GET
   response:
     body: '{"ipv6": "1234::5678", "updated": "2018-01-02T03:04:05", "label":
@@ -161,7 +161,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36396
+    url: https://api.linode.com/v4beta/nodebalancers/36396
     method: PUT
   response:
     body: '{"id": 36396, "label": "balancer36396_renamed", "ipv6": "1234::5678",
@@ -234,7 +234,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36396
+    url: https://api.linode.com/v4beta/nodebalancers/36396
     method: DELETE
   response:
     body: '{}'

diff --git a/fixtures/ExampleCreateNodeBalancerConfig.yaml b/fixtures/ExampleCreateNodeBalancerConfig.yaml
@@ -13,7 +13,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers
+    url: https://api.linode.com/v4beta/nodebalancers
     method: POST
   response:
     body: '{"ipv6": "1234::5678", "updated": "2018-01-02T03:04:05", "label":
@@ -86,7 +86,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36397/configs
+    url: https://api.linode.com/v4beta/nodebalancers/36397/configs
     method: POST
   response:
     body: '{"id": 32600, "check_attempts": 3, "check_timeout": 30, "ssl_cert": null,
@@ -161,7 +161,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36397/configs/32600
+    url: https://api.linode.com/v4beta/nodebalancers/36397/configs/32600
     method: PUT
   response:
     body: '{"check": "none", "protocol": "http", "check_interval": 0, "cipher_suite":
@@ -236,7 +236,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36397/configs
+    url: https://api.linode.com/v4beta/nodebalancers/36397/configs
     method: GET
   response:
     body: '{"data": [{"algorithm": "roundrobin", "check_timeout": 30, "check_path":
@@ -313,7 +313,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36397/configs/32600
+    url: https://api.linode.com/v4beta/nodebalancers/36397/configs/32600
     method: GET
   response:
     body: '{"id": 32600, "check_attempts": 3, "check_timeout": 30, "ssl_cert": null,
@@ -390,7 +390,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36397/configs/32600
+    url: https://api.linode.com/v4beta/nodebalancers/36397/configs/32600
     method: DELETE
   response:
     body: '{}'
@@ -460,7 +460,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36397
+    url: https://api.linode.com/v4beta/nodebalancers/36397
     method: DELETE
   response:
     body: '{}'

diff --git a/fixtures/ExampleCreateNodeBalancerNode.yaml b/fixtures/ExampleCreateNodeBalancerNode.yaml
@@ -13,7 +13,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers
+    url: https://api.linode.com/v4beta/nodebalancers
     method: POST
   response:
     body: '{"region": "us-east", "created": "2018-01-02T03:04:05", "updated": "2018-01-02T03:04:05",
@@ -86,7 +86,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36398/configs
+    url: https://api.linode.com/v4beta/nodebalancers/36398/configs
     method: POST
   response:
     body: '{"algorithm": "roundrobin", "check_timeout": 30, "check_path": "", "ssl_key":
@@ -161,7 +161,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36398/configs/32601/nodes
+    url: https://api.linode.com/v4beta/nodebalancers/36398/configs/32601/nodes
     method: POST
   response:
     body: '{"id": 313257, "address": "192.168.030.040:80", "mode": "accept", "nodebalancer_id":
@@ -232,7 +232,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36398/configs/32601/nodes/313257
+    url: https://api.linode.com/v4beta/nodebalancers/36398/configs/32601/nodes/313257
     method: PUT
   response:
     body: '{"mode": "accept", "status": "Unknown", "config_id": 32601, "id": 313257,
@@ -304,7 +304,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36398/configs/32601/nodes
+    url: https://api.linode.com/v4beta/nodebalancers/36398/configs/32601/nodes
     method: GET
   response:
     body: '{"data": [{"mode": "accept", "status": "Unknown", "config_id": 32601, "id":
@@ -378,7 +378,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36398/configs/32601/nodes/313257
+    url: https://api.linode.com/v4beta/nodebalancers/36398/configs/32601/nodes/313257
     method: GET
   response:
     body: '{"address": "192.168.030.040:8080", "nodebalancer_id": 36398, "label": "192.168.030.040-80",
@@ -452,7 +452,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36398/configs/32601/nodes/313257
+    url: https://api.linode.com/v4beta/nodebalancers/36398/configs/32601/nodes/313257
     method: DELETE
   response:
     body: '{}'
@@ -522,7 +522,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36398/configs/32601
+    url: https://api.linode.com/v4beta/nodebalancers/36398/configs/32601
     method: DELETE
   response:
     body: '{}'
@@ -592,7 +592,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/nodebalancers/36398
+    url: https://api.linode.com/v4beta/nodebalancers/36398
     method: DELETE
   response:
     body: '{}'

diff --git a/fixtures/ExampleCreateStackscript.yaml b/fixtures/ExampleCreateStackscript.yaml
@@ -15,7 +15,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/stackscripts
+    url: https://api.linode.com/v4beta/linode/stackscripts
     method: POST
   response:
     body: '{"user_defined_fields": [], "images": ["linode/debian9", "linode/ubuntu18.04"],
@@ -94,7 +94,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/stackscripts/324986
+    url: https://api.linode.com/v4beta/linode/stackscripts/324986
     method: PUT
   response:
     body: '{"script": "#!/bin/bash\necho 2\n", "images": ["linode/debian9", "linode/ubuntu18.04"],
@@ -173,7 +173,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/stackscripts/324986
+    url: https://api.linode.com/v4beta/linode/stackscripts/324986
     method: PUT
   response:
     body: '{"user_gravatar_id": "8293c9dd7d457c488afaee7fea921610", "id": 324986,
@@ -249,7 +249,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/stackscripts/324986
+    url: https://api.linode.com/v4beta/linode/stackscripts/324986
     method: GET
   response:
     body: '{"user_defined_fields": [], "images": ["linode/debian9", "linode/ubuntu18.04"],
@@ -328,7 +328,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/linode/stackscripts/324986
+    url: https://api.linode.com/v4beta/linode/stackscripts/324986
     method: DELETE
   response:
     body: '{}'

diff --git a/fixtures/ExampleGetAccount.yaml b/fixtures/ExampleGetAccount.yaml
@@ -13,7 +13,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/account
+    url: https://api.linode.com/v4beta/account
     method: GET
   response:
     body: '{"phone": "555-555-5555", "email": "[email protected]", "address_2":

diff --git a/fixtures/ExampleGetImage_missing.yaml b/fixtures/ExampleGetImage_missing.yaml
@@ -13,7 +13,7 @@ interactions:
       - application/json
       User-Agent:
       - linodego 0.0.1 https://github.com/linode/linodego
-    url: https://api.linode.com/v4/images/not-found
+    url: https://api.linode.com/v4beta/images/not-found
     method: GET
   response:
     body: '{"errors": [{"reason": "Not found"}]}'