Skip to content

TPT-4473: Extend fixture sanitizer #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mawilk90 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

TPT-4473: Extend fixture sanitizer #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3bde156
Refactor make's sanitize to cover: root_pass, hostname, ipv4
mawilk90 May 29, 2026
d87e3ab
Sanitize existing fixtures with new sanitizer's setup
mawilk90 May 29, 2026
8be8eb9
Merge branch 'main' into hotfix/TPT-4473-extend-fixture-sanitizer
mawilk90 Jun 1, 2026
702dca6
Merge branch 'main' into hotfix/TPT-4473-extend-fixture-sanitizer
mawilk90 Jun 8, 2026
964b3df
Merge branch 'main' into hotfix/TPT-4474-extend-fixture-sanitizer
mawilk90 Jun 8, 2026
fe6a06b
Merge branch 'main' into hotfix/TPT-4473-extend-fixture-sanitizer
mawilk90 Jun 15, 2026
ae036ec
Update fixtures
mawilk90 Jun 15, 2026
30f67db
Update IF statement for assertions in TestReservedIPAddresses_EndToEn…
mawilk90 Jun 15, 2026
2246b3b
Merge branch 'main' into hotfix/TPT-4473-extend-fixture-sanitizer
mawilk90 Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ sanitize:
sed -E -i.bak \
-e 's_stats/20[0-9]{2}/[1-9][0-2]?_stats/2018/1_g' \
-e 's/(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/1234::5678/g' \
-e 's/((25[0-5]|(2[0-4]|1[0-9]|[1-9])[0-9])\.){3}(25[0-5]|(2[0-4]|1[0-9]|[1-9])[0-9])/192.0.2.0/g' \
Comment thread
mawilk90 marked this conversation as resolved.
-e 's/"root_pass":"[^"]*"/"root_pass":"thisIsYourRootPassword"/g' \
-e 's/"hostname": *"[^"]*"/"hostname":"thisIsYourHostName"/g' \
$$yaml; \
done
@find $(FIXTURES_DIR) -name *yaml.bak -exec rm {} \;
Expand Down
8 changes: 4 additions & 4 deletions test/integration/fixtures/ExampleCreateNodeBalancer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interactions:
method: POST
response:
body: '{"id": 1595315, "label": "balancer1595315", "region": "us-southeast", "type":
"common", "hostname": "139-144-167-61.ip.linodeusercontent.com", "ipv4": "139.144.167.61",
"common", "hostname":"thisIsYourHostName", "ipv4": "192.0.2.0",
"ipv6": "1234::5678", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "client_conn_throttle": 20, "client_udp_sess_throttle":
0, "lke_cluster": null, "tags": [], "transfer": {"in": null, "out": null, "total":
Expand Down Expand Up @@ -81,7 +81,7 @@ interactions:
method: GET
response:
body: '{"id": 1595315, "label": "balancer1595315", "region": "us-southeast", "type":
"common", "hostname": "139-144-167-61.ip.linodeusercontent.com", "ipv4": "139.144.167.61",
"common", "hostname":"thisIsYourHostName", "ipv4": "192.0.2.0",
"ipv6": "1234::5678", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "client_conn_throttle": 20, "client_udp_sess_throttle":
0, "lke_cluster": null, "tags": [], "transfer": {"in": null, "out": null, "total":
Expand Down Expand Up @@ -148,8 +148,8 @@ interactions:
method: PUT
response:
body: '{"id": 1595315, "label": "balancer1595315_renamed", "region": "us-southeast",
"type": "common", "hostname": "139-144-167-61.ip.linodeusercontent.com", "ipv4":
"139.144.167.61", "ipv6": "1234::5678", "created": "2018-01-02T03:04:05",
"type": "common", "hostname":"thisIsYourHostName", "ipv4":
"192.0.2.0", "ipv6": "1234::5678", "created": "2018-01-02T03:04:05",
"updated": "2018-01-02T03:04:05", "client_conn_throttle": 20, "client_udp_sess_throttle":
0, "lke_cluster": null, "tags": [], "transfer": {"in": null, "out": null, "total":
null}}'
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fixtures/ExampleCreateNodeBalancerConfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interactions:
method: POST
response:
body: '{"id": 1595316, "label": "balancer1595316", "region": "us-southeast", "type":
"common", "hostname": "139-144-167-102.ip.linodeusercontent.com", "ipv4": "139.144.167.102",
"common", "hostname":"thisIsYourHostName", "ipv4": "192.0.2.0",
"ipv6": "1234::5678", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "client_conn_throttle": 20, "client_udp_sess_throttle":
0, "lke_cluster": null, "tags": [], "transfer": {"in": null, "out": null, "total":
Expand Down
22 changes: 11 additions & 11 deletions test/integration/fixtures/ExampleCreateNodeBalancerNode.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ interactions:
method: POST
response:
body: '{"id": 1595317, "label": "balancer1595317", "region": "us-southeast", "type":
"common", "hostname": "139-144-166-98.ip.linodeusercontent.com", "ipv4": "139.144.166.98",
"common", "hostname":"thisIsYourHostName", "ipv4": "192.0.2.0",
"ipv6": "1234::5678", "created": "2018-01-02T03:04:05", "updated":
"2018-01-02T03:04:05", "client_conn_throttle": 20, "client_udp_sess_throttle":
0, "lke_cluster": null, "tags": [], "transfer": {"in": null, "out": null, "total":
Expand Down Expand Up @@ -135,7 +135,7 @@ interactions:
code: 200
duration: ""
- request:
body: '{"region":"us-southeast","type":"g6-nanode-1","label":"nodebalancer-example-instance","root_pass":"X''9kGnlSpG8\\2X[6]P6k}r716kEd9AD(I;xGu#6s?2-,C*;s`N*f{0uS7Ygi107T","image":"linode/debian12","firewall_id":2677167,"booted":false}'
body: '{"region":"us-southeast","type":"g6-nanode-1","label":"nodebalancer-example-instance","root_pass":"thisIsYourRootPassword","image":"linode/debian12","firewall_id":2677167,"booted":false}'
form: {}
headers:
Accept:
Expand All @@ -149,7 +149,7 @@ interactions:
response:
body: '{"id": 77641926, "label": "nodebalancer-example-instance", "group": "",
"status": "provisioning", "created": "2018-01-02T03:04:05", "updated": "2018-01-02T03:04:05",
"type": "g6-nanode-1", "ipv4": ["172.105.159.223"], "ipv6": "1234::5678/128",
"type": "g6-nanode-1", "ipv4": ["192.0.2.0"], "ipv6": "1234::5678/128",
"image": "linode/debian12", "region": "us-southeast", "site_type": "core", "specs":
{"disk": 25600, "memory": 1024, "vcpus": 1, "gpus": 0, "transfer": 1000, "accelerated_devices":
0}, "alerts": {"cpu": 90, "network_in": 10, "network_out": 10, "transfer_quota":
Expand Down Expand Up @@ -217,7 +217,7 @@ interactions:
url: https://api.linode.com/v4beta/linode/instances/77641926/ips
method: POST
response:
body: '{"address": "192.168.230.214", "gateway": null, "subnet_mask": "255.255.128.0",
body: '{"address": "192.0.2.0", "gateway": null, "subnet_mask": "255.255.128.0",
"prefix": 17, "type": "ipv4", "public": false, "rdns": null, "linode_id": 77641926,
"interface_id": null, "region": "us-southeast", "vpc_nat_1_1": null, "reserved":
false, "assigned_entity": {"id": 77641926, "type": "linode", "label": "nodebalancer-example-instance",
Expand Down Expand Up @@ -270,7 +270,7 @@ interactions:
code: 200
duration: ""
- request:
body: '{"address":"192.168.230.214:80","label":"node-192.168.230.214"}'
body: '{"address":"192.0.2.0:80","label":"node-192.0.2.0"}'
form: {}
headers:
Accept:
Expand All @@ -282,7 +282,7 @@ interactions:
url: https://api.linode.com/v4beta/nodebalancers/1595317/configs/2450488/nodes
method: POST
response:
body: '{"id": 2104029484, "address": "192.168.230.214:80", "label": "node-192.168.230.214",
body: '{"id": 2104029484, "address": "192.0.2.0:80", "label": "node-192.0.2.0",
"status": "Unknown", "weight": 50, "mode": "accept", "config_id": 2450488, "nodebalancer_id":
1595317, "vpc_config_id": null}'
headers:
Expand Down Expand Up @@ -333,7 +333,7 @@ interactions:
code: 200
duration: ""
- request:
body: '{"address":"192.168.230.214:8080","label":"node-192.168.230.214","weight":50,"mode":"accept"}'
body: '{"address":"192.0.2.0:8080","label":"node-192.0.2.0","weight":50,"mode":"accept"}'
form: {}
headers:
Accept:
Expand All @@ -345,7 +345,7 @@ interactions:
url: https://api.linode.com/v4beta/nodebalancers/1595317/configs/2450488/nodes/2104029484
method: PUT
response:
body: '{"id": 2104029484, "address": "192.168.230.214:8080", "label": "node-192.168.230.214",
body: '{"id": 2104029484, "address": "192.0.2.0:8080", "label": "node-192.0.2.0",
"status": "Unknown", "weight": 50, "mode": "accept", "config_id": 2450488, "nodebalancer_id":
1595317, "vpc_config_id": null}'
headers:
Expand Down Expand Up @@ -408,8 +408,8 @@ interactions:
url: https://api.linode.com/v4beta/nodebalancers/1595317/configs/2450488/nodes?page=1
method: GET
response:
body: '{"data": [{"id": 2104029484, "address": "192.168.230.214:8080", "label":
"node-192.168.230.214", "status": "Unknown", "weight": 50, "mode": "accept",
body: '{"data": [{"id": 2104029484, "address": "192.0.2.0:8080", "label":
"node-192.0.2.0", "status": "Unknown", "weight": 50, "mode": "accept",
"config_id": 2450488, "nodebalancer_id": 1595317, "vpc_config_id": null}], "page":
1, "pages": 1, "results": 1}'
headers:
Expand Down Expand Up @@ -473,7 +473,7 @@ interactions:
url: https://api.linode.com/v4beta/nodebalancers/1595317/configs/2450488/nodes/2104029484
method: GET
response:
body: '{"id": 2104029484, "address": "192.168.230.214:8080", "label": "node-192.168.230.214",
body: '{"id": 2104029484, "address": "192.0.2.0:8080", "label": "node-192.0.2.0",
"status": "Unknown", "weight": 50, "mode": "accept", "config_id": 2450488, "nodebalancer_id":
1595317, "vpc_config_id": null}'
headers:
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fixtures/ExampleListStackscripts_page1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,7 +1902,7 @@ interactions:
"label": "Blb", "description": "", "ordinal": 0, "logo_url": "", "images": ["linode/kali"],
"deployments_total": 0, "deployments_active": 0, "is_public": true, "mine":
false, "created": "2018-01-02T03:04:05", "updated": "2018-01-02T03:04:05", "rev_note":
"", "script": "#!/bunssh root@173.255.202.248", "user_defined_fields": []},
"", "script": "#!/bunssh root@192.0.2.0", "user_defined_fields": []},
{"id": 1056306, "username": "Poshumei", "user_gravatar_id": "f08d22196d2e64cd2cc9c03d865d3beb",
"label": "ETH", "description": "", "ordinal": 0, "logo_url": "", "images": ["linode/ubuntu20.04"],
"deployments_total": 0, "deployments_active": 0, "is_public": true, "mine":
Expand Down
Loading