diff --git a/README.md b/README.md index 77c6f38..8673f25 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Flags: ``` ## Build the project -Requires Go version 1.22 or later. +Requires Go version 1.23 or later. ```shell git clone git@github.com:np-guard/cloud-resource-collector.git cd cloud-resource-collector diff --git a/go.mod b/go.mod index 3375641..8928a41 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/IBM/go-sdk-core/v5 v5.17.5 github.com/IBM/networking-go-sdk v0.49.0 github.com/IBM/platform-services-go-sdk v0.69.1 - github.com/IBM/vpc-go-sdk v0.58.0 + github.com/IBM/vpc-go-sdk v0.60.0 github.com/aws/aws-sdk-go-v2/config v1.27.41 github.com/aws/aws-sdk-go-v2/service/ec2 v1.163.0 github.com/np-guard/models v0.5.0 diff --git a/go.sum b/go.sum index 75d6530..7c89513 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/IBM/networking-go-sdk v0.49.0 h1:lPS34u3C0JVrbxH+Ulua76Nwl6Frv8BEfq6L github.com/IBM/networking-go-sdk v0.49.0/go.mod h1:G9CKbmPE8gSLjN+ABh4hIZ1bMx076enl5Eekvj6zQnA= github.com/IBM/platform-services-go-sdk v0.69.1 h1:Wb8BYVpsPIppWbOQCgF7ytm+BbSOXdWWCf9zcZ6xGA4= github.com/IBM/platform-services-go-sdk v0.69.1/go.mod h1:ZP3zUDxR1qRdUqzFdnJOlQN0QpVYol2eOUCv4uk03Jc= -github.com/IBM/vpc-go-sdk v0.58.0 h1:Slk1jkcV7tPnf0iECQV2Oja7W8Bom0z7k9M4fMBY4bI= -github.com/IBM/vpc-go-sdk v0.58.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw= +github.com/IBM/vpc-go-sdk v0.60.0 h1:4MD9dTmg+alJivsAEPmKE4qx59nv0Gsweju/XF+Z2jo= +github.com/IBM/vpc-go-sdk v0.60.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= diff --git a/pkg/ibm/datamodel/test/data/demo-with-instances-config.json b/pkg/ibm/datamodel/test/data/demo-with-instances-config.json index 70ce577..d8823fd 100644 --- a/pkg/ibm/datamodel/test/data/demo-with-instances-config.json +++ b/pkg/ibm/datamodel/test/data/demo-with-instances-config.json @@ -42,6 +42,7 @@ "name": "ky-testenv-edge-acl" }, "default_routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -105,6 +106,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -221,6 +223,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -344,6 +347,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -460,6 +464,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -576,6 +581,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -692,6 +698,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -815,6 +822,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -931,6 +939,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -1047,6 +1056,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-testenv-default-table", @@ -3155,11 +3165,13 @@ ], "advertise_routes_to": [], "created_at": "2023-04-27T11:42:15.000Z", + "crn": null, "href": "href:10", "id": "id:11", "is_default": true, "lifecycle_state": "stable", "name": "ky-testenv-default-table", + "resource_group": null, "resource_type": "routing_table", "route_direct_link_ingress": false, "route_internet_ingress": false, diff --git a/pkg/ibm/datamodel/test/data/experiments_env.json b/pkg/ibm/datamodel/test/data/experiments_env.json index 25b09d3..e8ec9f4 100644 --- a/pkg/ibm/datamodel/test/data/experiments_env.json +++ b/pkg/ibm/datamodel/test/data/experiments_env.json @@ -42,6 +42,7 @@ "name": "strangely-disallow-golly-caviar" }, "default_routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "stingray-rupture-budget-lyrics", @@ -165,6 +166,7 @@ "name": "clambake-magical-tulip-cornmeal" }, "default_routing_table": { + "crn": null, "href": "href:23", "id": "id:24", "name": "penholder-gainfully-reptiles-wold", @@ -264,6 +266,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "stingray-rupture-budget-lyrics", @@ -382,6 +385,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "stingray-rupture-budget-lyrics", @@ -500,6 +504,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:77", "id": "id:78", "name": "rt1-ky", @@ -618,6 +623,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:23", "id": "id:24", "name": "penholder-gainfully-reptiles-wold", @@ -2368,11 +2374,13 @@ ], "advertise_routes_to": [], "created_at": "2023-06-06T07:18:23.000Z", + "crn": null, "href": "href:10", "id": "id:11", "is_default": true, "lifecycle_state": "stable", "name": "stingray-rupture-budget-lyrics", + "resource_group": null, "resource_type": "routing_table", "route_direct_link_ingress": false, "route_internet_ingress": false, @@ -2407,11 +2415,13 @@ "accept_routes_from": [], "advertise_routes_to": [], "created_at": "2023-06-06T07:18:38.000Z", + "crn": null, "href": "href:77", "id": "id:78", "is_default": false, "lifecycle_state": "stable", "name": "rt1-ky", + "resource_group": null, "resource_type": "routing_table", "route_direct_link_ingress": false, "route_internet_ingress": false, @@ -2523,11 +2533,13 @@ ], "advertise_routes_to": [], "created_at": "2023-06-06T07:18:23.000Z", + "crn": null, "href": "href:23", "id": "id:24", "is_default": true, "lifecycle_state": "stable", "name": "penholder-gainfully-reptiles-wold", + "resource_group": null, "resource_type": "routing_table", "route_direct_link_ingress": false, "route_internet_ingress": false, diff --git a/pkg/ibm/datamodel/test/data/iks-on-goldeneye-vpc-config.json b/pkg/ibm/datamodel/test/data/iks-on-goldeneye-vpc-config.json index 3627f9f..ec583ab 100644 --- a/pkg/ibm/datamodel/test/data/iks-on-goldeneye-vpc-config.json +++ b/pkg/ibm/datamodel/test/data/iks-on-goldeneye-vpc-config.json @@ -42,6 +42,7 @@ "name": "ky-test-edge-acl" }, "default_routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -273,6 +274,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -466,6 +468,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -641,6 +644,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -827,6 +831,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -926,6 +931,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -1025,6 +1031,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -1124,6 +1131,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -1238,6 +1246,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -1352,6 +1361,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -1466,6 +1476,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -1580,6 +1591,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -1694,6 +1706,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "ky-test-default-table", @@ -3170,11 +3183,13 @@ ], "advertise_routes_to": [], "created_at": "2024-03-21T13:02:11.000Z", + "crn": null, "href": "href:10", "id": "id:11", "is_default": true, "lifecycle_state": "stable", "name": "ky-test-default-table", + "resource_group": null, "resource_type": "routing_table", "route_direct_link_ingress": false, "route_internet_ingress": false, @@ -3278,12 +3293,15 @@ ], "load_balancers": [ { + "access_mode": null, + "availability": null, "created_at": "2024-03-21T13:23:42.000Z", "crn": "crn:75", "hostname": "4f68e369-us-south.lb.appdomain.cloud", "href": "href:76", "id": "id:77", "instance_groups_supported": true, + "is_private_path": null, "is_public": true, "logging": { "datapath": { @@ -3338,6 +3356,7 @@ } ], "security_groups_supported": true, + "source_ip_session_persistence_supported": null, "subnets": [ { "crn": "crn:222", diff --git a/pkg/ibm/datamodel/test/data/transit-gateways.json b/pkg/ibm/datamodel/test/data/transit-gateways.json index 843c97f..923d850 100644 --- a/pkg/ibm/datamodel/test/data/transit-gateways.json +++ b/pkg/ibm/datamodel/test/data/transit-gateways.json @@ -42,6 +42,7 @@ "name": "deduct-purifier-among-appear" }, "default_routing_table": { + "crn": null, "href": "href:10", "id": "id:11", "name": "numeral-prevalent-prewashed-dangle", @@ -154,6 +155,7 @@ "name": "relock-pebble-canola-septate" }, "default_routing_table": { + "crn": null, "href": "href:23", "id": "id:24", "name": "doorbell-spoof-general-epidermis", @@ -266,6 +268,7 @@ "name": "editor-travesty-probation-glaring" }, "default_routing_table": { + "crn": null, "href": "href:36", "id": "id:37", "name": "ramp-mascot-citadel-tint", @@ -362,6 +365,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:36", "id": "id:37", "name": "ramp-mascot-citadel-tint", @@ -478,6 +482,7 @@ }, "resource_type": "subnet", "routing_table": { + "crn": null, "href": "href:23", "id": "id:24", "name": "doorbell-spoof-general-epidermis", @@ -1523,11 +1528,13 @@ ], "advertise_routes_to": [], "created_at": "2023-08-14T11:33:06.000Z", + "crn": null, "href": "href:10", "id": "id:11", "is_default": true, "lifecycle_state": "stable", "name": "numeral-prevalent-prewashed-dangle", + "resource_group": null, "resource_type": "routing_table", "route_direct_link_ingress": false, "route_internet_ingress": false, @@ -1554,11 +1561,13 @@ ], "advertise_routes_to": [], "created_at": "2023-11-09T13:17:20.000Z", + "crn": null, "href": "href:23", "id": "id:24", "is_default": true, "lifecycle_state": "stable", "name": "doorbell-spoof-general-epidermis", + "resource_group": null, "resource_type": "routing_table", "route_direct_link_ingress": false, "route_internet_ingress": false, @@ -1593,11 +1602,13 @@ ], "advertise_routes_to": [], "created_at": "2023-11-09T13:17:20.000Z", + "crn": null, "href": "href:36", "id": "id:37", "is_default": true, "lifecycle_state": "stable", "name": "ramp-mascot-citadel-tint", + "resource_group": null, "resource_type": "routing_table", "route_direct_link_ingress": false, "route_internet_ingress": false,