From 297071db13e6c0672945ad85a34e672adb12d41c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 16 May 2025 01:13:37 +0000 Subject: [PATCH 1/4] fix(deps): update stackit sdk modules --- go.mod | 28 ++++++++++++++-------------- go.sum | 58 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/go.mod b/go.mod index eceb1d08e..dcd7702cc 100644 --- a/go.mod +++ b/go.mod @@ -16,23 +16,23 @@ require ( github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.20.1 github.com/stackitcloud/stackit-sdk-go/core v0.17.1 - github.com/stackitcloud/stackit-sdk-go/services/alb v0.2.3 + github.com/stackitcloud/stackit-sdk-go/services/alb v0.3.1 github.com/stackitcloud/stackit-sdk-go/services/authorization v0.6.3 - github.com/stackitcloud/stackit-sdk-go/services/dns v0.13.3 + github.com/stackitcloud/stackit-sdk-go/services/dns v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/git v0.3.3 github.com/stackitcloud/stackit-sdk-go/services/iaas v0.22.2 github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.0 - github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.21.2 + github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.22.0 github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.0.4 - github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.13.3 - github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.0.2 + github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.14.0 + github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.1.0 github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.11.4 - github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.0.3 + github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.1.0 github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.0.3 - github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.6.3 - github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.0.3 - github.com/stackitcloud/stackit-sdk-go/services/ske v0.22.4 - github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.0.3 + github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.7.0 + github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.1.0 + github.com/stackitcloud/stackit-sdk-go/services/ske v0.23.0 + github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.1.0 github.com/zalando/go-keyring v0.2.6 golang.org/x/mod v0.24.0 golang.org/x/oauth2 v0.30.0 @@ -236,13 +236,13 @@ require ( github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.14.0 // indirect github.com/spf13/cast v1.7.1 // indirect - github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.0.3 - github.com/stackitcloud/stackit-sdk-go/services/logme v0.22.2 + github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.1.0 + github.com/stackitcloud/stackit-sdk-go/services/logme v0.23.0 github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.24.0 github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.1.3 - github.com/stackitcloud/stackit-sdk-go/services/observability v0.5.2 + github.com/stackitcloud/stackit-sdk-go/services/observability v0.6.0 github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.24.0 - github.com/stackitcloud/stackit-sdk-go/services/redis v0.22.2 + github.com/stackitcloud/stackit-sdk-go/services/redis v0.23.0 github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.33.0 // indirect diff --git a/go.sum b/go.sum index e6cf43226..5a61dae2f 100644 --- a/go.sum +++ b/go.sum @@ -564,54 +564,54 @@ github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YE github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stackitcloud/stackit-sdk-go/core v0.17.1 h1:TTrVoB1lERd/qfWzpe6HpwCJSjtaGnUI7UE7ITb5IT0= github.com/stackitcloud/stackit-sdk-go/core v0.17.1/go.mod h1:8KIw3czdNJ9sdil9QQimxjR6vHjeINFrRv0iZ67wfn0= -github.com/stackitcloud/stackit-sdk-go/services/alb v0.2.3 h1:JVRsMN5uKPxy9ynsxmhGfAecz87LjqN5G5Vg8MRwyRc= -github.com/stackitcloud/stackit-sdk-go/services/alb v0.2.3/go.mod h1:IYXv5QX/LEYfF02eN1/1KKo979yPewWhrbhpRnG2yOg= +github.com/stackitcloud/stackit-sdk-go/services/alb v0.3.1 h1:7JbFIXiq3IlFST7N7kS0gxX5EKX/rYs87kUVtR00sHw= +github.com/stackitcloud/stackit-sdk-go/services/alb v0.3.1/go.mod h1:IYXv5QX/LEYfF02eN1/1KKo979yPewWhrbhpRnG2yOg= github.com/stackitcloud/stackit-sdk-go/services/authorization v0.6.3 h1:aXVMNdiHCtT07bro52KjnxEBMDNK9DweJBlk+G4ElCM= github.com/stackitcloud/stackit-sdk-go/services/authorization v0.6.3/go.mod h1:dJ19ZwFjp2bfC5ZobXV3vUdSpE3quUw3GuoFSKLpHIo= -github.com/stackitcloud/stackit-sdk-go/services/dns v0.13.3 h1:WJnA6YTOlBxMJf9PRuxkXduxj+fyWi+wOks69PvN1qI= -github.com/stackitcloud/stackit-sdk-go/services/dns v0.13.3/go.mod h1:PMHoavoIaRZpkI9BA0nsnRjGoHASVSBon45XB3QyhMA= +github.com/stackitcloud/stackit-sdk-go/services/dns v0.14.0 h1:aji1vxn1LVfM+SCfOSXUz0Pwv+ZQjyt9PmV0ejHLy5U= +github.com/stackitcloud/stackit-sdk-go/services/dns v0.14.0/go.mod h1:PMHoavoIaRZpkI9BA0nsnRjGoHASVSBon45XB3QyhMA= github.com/stackitcloud/stackit-sdk-go/services/git v0.3.3 h1:/NXxiJf/NFpj+DFXc07vsx+0he/xufdhIskXUlSeyyw= github.com/stackitcloud/stackit-sdk-go/services/git v0.3.3/go.mod h1:XhXHJpOVC9Rpwyf1G+EpMbprBafH9aZb8vWBdR+z0WM= github.com/stackitcloud/stackit-sdk-go/services/iaas v0.22.2 h1:zh6e2eHgqex++fr6N0RK7wMMBGesC3QhBd42FdTq2Z8= github.com/stackitcloud/stackit-sdk-go/services/iaas v0.22.2/go.mod h1:QNH50Pq0Hu21lLDOwa02PIjRjTl0LfEdHoz5snGQRn8= -github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.0.3 h1:StQg5p4h1aLFwIHQWWe5l44aFue+ZvQMGDbypP1DMYw= -github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.0.3/go.mod h1:h3oM6cS23Yfynp8Df1hNr0FxtY5Alii/2g8Wqi5SIVE= -github.com/stackitcloud/stackit-sdk-go/services/logme v0.22.2 h1:wM/Gop6sG/fkpzsZGhrPN2AzkKxHup175WaFBGaeQ7s= -github.com/stackitcloud/stackit-sdk-go/services/logme v0.22.2/go.mod h1:+3jizYma6Dq3XVn6EMMdSBF9eIm0w6hCJvrStB3AIL0= -github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.24.0 h1:t/Ten9AuoWFmrDq5gAI3kVZShF3i8zEAaeBsYYqiaao= +github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.1.0 h1:9gUobm//GzVGYTbfa39tNRceEjQskNuNVZyUS9rOZ4Y= +github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.1.0/go.mod h1:h3oM6cS23Yfynp8Df1hNr0FxtY5Alii/2g8Wqi5SIVE= +github.com/stackitcloud/stackit-sdk-go/services/logme v0.23.0 h1:ksxHeILZutooun0Hy/cY8qikC9owya1UDJR+FSQSlRw= +github.com/stackitcloud/stackit-sdk-go/services/logme v0.23.0/go.mod h1:+3jizYma6Dq3XVn6EMMdSBF9eIm0w6hCJvrStB3AIL0= +gthub.com/stackitcloud/stackit-sdk-go/services/mariadb v0.24.0 h1:t/Ten9AuoWFmrDq5gAI3kVZShF3i8zEAaeBsYYqiaao= github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.24.0/go.mod h1:qgvi3qiAzB1wKpMJ5CPnEaUToeiwgnQxGvlkjdisaLU= github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.0 h1:U/IhjLOz0vG6zuxTqGhBd8f609s6JB+X9PaL6x/VM58= github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.0/go.mod h1:+JSnz5/AvGN5ek/iH008frRc/NgjSr1EVOTIbyLwAuQ= github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.1.3 h1:RFe45uLzTSmd69yaQe5zLDY3+1hYi6/lSZUVcjbb6+c= github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.1.3/go.mod h1:iCOYS9yICXQPyMAIdUGMqJDLY8HXKiVAdiMzO/mPvtA= -github.com/stackitcloud/stackit-sdk-go/services/observability v0.5.2 h1:anITBRTlQoneEawVg4hHjs4IceFJLFq9KdDU+d5y5DU= -github.com/stackitcloud/stackit-sdk-go/services/observability v0.5.2/go.mod h1:1gMNjPCqT868oIqdWGkiReS1G/qpM4bYKYBmDRi8sqg= -github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.21.2 h1:p1bub8QayR+NkYtGd8DNSjxlRmoyR7Dr97LiwWVW1Ow= -github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.21.2/go.mod h1:c30J6f/fXtbzcHkH3ZcabZUek3wfy5CRnEkcW5e5yXg= +github.com/stackitcloud/stackit-sdk-go/services/observability v0.6.0 h1:QqlFcMv/TbIG95u/xHB/9aLvElplj1lKnTIyUSwEtT4= +github.com/stackitcloud/stackit-sdk-go/services/observability v0.6.0/go.mod h1:1gMNjPCqT868oIqdWGkiReS1G/qpM4bYKYBmDRi8sqg= +github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.22.0 h1:XDt4NCiWdpjbbw9UevsxLJ3SGkO1bSoJnV96RSHNNoI= +github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.22.0/go.mod h1:c30J6f/fXtbzcHkH3ZcabZUek3wfy5CRnEkcW5e5yXg= github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.0.4 h1:AIQueG1oSdKbxK8ASZZYkmqzJ7NhKzKcR5AQsndoF18= github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.0.4/go.mod h1:4g/L5PHfz1xk3udEhvPy2nXiH4UgRO5Cj6iwUa7k5VQ= github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.24.0 h1:YEfhKt3T25uY7vs8QcAPfdTs1GLil0BcrLCJ5RhMyR0= github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.24.0/go.mod h1:9JoCgKe2IKmawcuAYIuxrAMMb6pk5XiY80Z3sU7IWy0= -github.com/stackitcloud/stackit-sdk-go/services/redis v0.22.2 h1:KKANO+wsLVkuH8N+xuYrEx+rDcliv48zYk3I7QzdX3A= -github.com/stackitcloud/stackit-sdk-go/services/redis v0.22.2/go.mod h1:mID7cr40WzI4wdvveYhLzvkk+zPfolfo5+VcDGo5slU= -github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.13.3 h1:4DNnEZj4uSyE+gDS+j9MCUuax9nfnttfro+JJE8QRSE= -github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.13.3/go.mod h1:Picm0mP7TUBTAu+MzWtedz61LczMnWH4ghPjwB/g5DE= -github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.0.2 h1:+YwMWWvZlUtw6TEfTqXPdUyN9hbkECU4DULwgIMu6A0= -github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.0.2/go.mod h1:qId86UiowpDDs0L+mstdzz3xXtnW+R56wh7q8CQltb4= +github.com/stackitcloud/stackit-sdk-go/services/redis v0.23.0 h1:arcom/1Chl3+SkDZYRNx5IemkLlqU2mnXrQmg9dsxQI= +github.com/stackitcloud/stackit-sdk-go/services/redis v0.23.0/go.mod h1:mID7cr40WzI4wdvveYhLzvkk+zPfolfo5+VcDGo5slU= +github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.14.0 h1:Rpbt83RyXS0AMw97g5L9oQdCAmVBGAyHpeCcDXesuEk= +github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.14.0/go.mod h1:Picm0mP7TUBTAu+MzWtedz61LczMnWH4ghPjwB/g5DE= +github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.1.0 h1:nvwaviIDf5ffAydfQBrl48K1nPowyDq05ompo9ZzFzY= +github.com/stackitcloud/stackit-sdk-go/services/runcommand v1.1.0/go.mod h1:qId86UiowpDDs0L+mstdzz3xXtnW+R56wh7q8CQltb4= github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.11.4 h1:UCX1qy44q22bDGv7BhLtOrWCzriS9m4MQsIOX6n+lgM= github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.11.4/go.mod h1:iD7R3CNdLUDUyKP+lATsQy+V4QGMMOb15zPnNq4wnbs= -github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.0.3 h1:OR5CZnxZMbGXsYPOZL00En3RhXeUuEJcZVN9iSxxTs8= -github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.0.3/go.mod h1:j2GV/ePXEccwq0WV7DtmKpsZcJ2X45Be3D4oAlJdddo= +github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.1.0 h1:cKQAuKSihSX1Jpacub2rZ1StItiO7SIO0y+Fi2yukd4= +github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.1.0/go.mod h1:j2GV/ePXEccwq0WV7DtmKpsZcJ2X45Be3D4oAlJdddo= github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.0.3 h1:iLyXsBF+lP7iE4rnoK3hO8l4wHcgySRXD65oeUgt6Jc= github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.0.3/go.mod h1:5F7/2BiKhrbvHD56mj5xR9qf8P0V2yMgeitmdIpQv4s= -github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.6.3 h1:qCn6ZS/oJEqA4PBMLMDvvctQ4eQEoCQSSWES394+AcQ= -github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.6.3/go.mod h1:e3WMlYcUZZ5bpndWuCrxEQqIOPsYPuus9O/EG2eIfG4= -github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.0.3 h1:rDsIPzaNJ4bnKJp9XFNzna+pXylGYVHUBPl5hqBWhX8= -github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.0.3/go.mod h1:TYWEik7b2aJrCJrRWU3mn1p1hmShCwizRthT3xl6z0o= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.22.4 h1:whyCGfzlLcyb23uKGJLrftjT57vqa1jS3Xz5voUHK+M= -github.com/stackitcloud/stackit-sdk-go/services/ske v0.22.4/go.mod h1:nJTJ3qT2xHmOs2aqQgBPfOLp322gE9pvpRaluTlRmN8= -github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.0.3 h1:MF46ffu+A8eu17N7LGFG2T50PhjDw2L0f68Uu316r8U= -github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.0.3/go.mod h1:CyYJqR0tZWs2r5bGz69j4bmvhxdsd4QLCm1Uf+LouB0= +github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.7.0 h1:QiHkjmforciAfBnf/oMjGmoZWYYD38ZrgLNWK149xQQ= +github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.7.0/go.mod h1:e3WMlYcUZZ5bpndWuCrxEQqIOPsYPuus9O/EG2eIfG4= +github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.1.0 h1:Wb/eEqbnwLw+lsTlAC8qTFoLMtXOTWcZDUDSiUB7GnM= +github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.1.0/go.mod h1:TYWEik7b2aJrCJrRWU3mn1p1hmShCwizRthT3xl6z0o= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.23.0 h1:kPAYBLDJC8W3GvDt+KtqDl2EZJgbU9l1tUj0JbCWA+4= +github.com/stackitcloud/stackit-sdk-go/services/ske v0.23.0/go.mod h1:nJTJ3qT2xHmOs2aqQgBPfOLp322gE9pvpRaluTlRmN8= +github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.1.0 h1:awy7JzBwAVJEKcJVt1DBZtZ0qtdT2aEuWCkgQvKky9w= +github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.1.0/go.mod h1:CyYJqR0tZWs2r5bGz69j4bmvhxdsd4QLCm1Uf+LouB0= github.com/stbenjam/no-sprintf-host-port v0.2.0 h1:i8pxvGrt1+4G0czLr/WnmyH7zbZ8Bg8etvARQ1rpyl4= github.com/stbenjam/no-sprintf-host-port v0.2.0/go.mod h1:eL0bQ9PasS0hsyTyfTjjG+E80QIyPnBVQbYZyv20Jfk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From 165d335256a3f9ffdfeecf43f7cf9b1a2f265941 Mon Sep 17 00:00:00 2001 From: Marcel Jacek Date: Fri, 16 May 2025 17:27:00 +0200 Subject: [PATCH 2/4] fix: compile errors --- docs/stackit_dns_record-set_create.md | 2 +- docs/stackit_dns_zone_create.md | 2 +- internal/cmd/dns/record-set/create/create.go | 17 +++++++++++------ .../cmd/dns/record-set/create/create_test.go | 4 ++-- internal/cmd/dns/zone/create/create.go | 16 +++++++++++++--- internal/cmd/dns/zone/create/create_test.go | 11 +++++------ .../cmd/load-balancer/create/create_test.go | 4 ++-- .../generate-payload/generate_payload.go | 4 ++-- .../generate-payload/generate_payload_test.go | 8 ++++---- .../cmd/load-balancer/update/update_test.go | 4 ++-- .../scrape-config/create/create_test.go | 6 +++--- .../scrape-config/update/update_test.go | 2 +- internal/cmd/ske/cluster/create/create_test.go | 4 ++-- internal/cmd/ske/cluster/update/update_test.go | 4 ++-- internal/cmd/ske/options/options.go | 2 +- internal/pkg/services/dns/utils/utils.go | 2 +- .../pkg/services/observability/utils/utils.go | 6 +++--- .../services/observability/utils/utils_test.go | 12 ++++++------ .../services/serverbackup/utils/utils_test.go | 2 +- .../services/service-enablement/utils/utils.go | 3 +-- .../service-enablement/utils/utils_test.go | 11 ++++------- internal/pkg/services/ske/utils/utils.go | 2 +- internal/pkg/services/ske/utils/utils_test.go | 16 ++++++++-------- 23 files changed, 77 insertions(+), 67 deletions(-) diff --git a/docs/stackit_dns_record-set_create.md b/docs/stackit_dns_record-set_create.md index f692b80ad..dfb740ad9 100644 --- a/docs/stackit_dns_record-set_create.md +++ b/docs/stackit_dns_record-set_create.md @@ -25,7 +25,7 @@ stackit dns record-set create [flags] --name string Name of the record, should be compliant with RFC1035, Section 2.3.4 --record strings Records belonging to the record set --ttl int Time to live, if not provided defaults to the zone's default TTL - --type string Record type, one of ["A" "AAAA" "SOA" "CNAME" "NS" "MX" "TXT" "SRV" "PTR" "ALIAS" "DNAME" "CAA"] (default "A") + --type string Record type, one of ["A" "AAAA" "SOA" "CNAME" "NS" "MX" "TXT" "SRV" "PTR" "ALIAS" "DNAME" "CAA" "DNSKEY" "DS" "LOC" "NAPTR" "SSHFP" "TLSA" "URI" "CERT" "SVCB"] (default "A") --zone-id string Zone ID ``` diff --git a/docs/stackit_dns_zone_create.md b/docs/stackit_dns_zone_create.md index 081628e19..0a0efde1c 100644 --- a/docs/stackit_dns_zone_create.md +++ b/docs/stackit_dns_zone_create.md @@ -36,7 +36,7 @@ stackit dns zone create [flags] --primary strings Primary name server for secondary zone --refresh-time int Refresh time --retry-time int Retry time - --type string Zone type + --type string Zone type, one of: ["primary" "secondary"] ``` ### Options inherited from parent commands diff --git a/internal/cmd/dns/record-set/create/create.go b/internal/cmd/dns/record-set/create/create.go index 49db52860..045f6ce29 100644 --- a/internal/cmd/dns/record-set/create/create.go +++ b/internal/cmd/dns/record-set/create/create.go @@ -30,8 +30,8 @@ const ( ttlFlag = "ttl" typeFlag = "type" - defaultType = "A" - txtType = "TXT" + defaultType = dns.CREATERECORDSETPAYLOADTYPE_A + txtType = dns.CREATERECORDSETPAYLOADTYPE_TXT ) type inputModel struct { @@ -41,7 +41,7 @@ type inputModel struct { Name *string Records []string TTL *int64 - Type string + Type dns.CreateRecordSetPayloadTypes } func NewCmd(params *params.CmdParams) *cobra.Command { @@ -109,14 +109,17 @@ func NewCmd(params *params.CmdParams) *cobra.Command { } func configureFlags(cmd *cobra.Command) { - typeFlagOptions := []string{"A", "AAAA", "SOA", "CNAME", "NS", "MX", "TXT", "SRV", "PTR", "ALIAS", "DNAME", "CAA"} + var typeFlagOptions []string + for _, val := range dns.AllowedCreateRecordSetPayloadTypesEnumValues { + typeFlagOptions = append(typeFlagOptions, string(val)) + } cmd.Flags().Var(flags.UUIDFlag(), zoneIdFlag, "Zone ID") cmd.Flags().String(commentFlag, "", "User comment") cmd.Flags().String(nameFlag, "", "Name of the record, should be compliant with RFC1035, Section 2.3.4") cmd.Flags().Int64(ttlFlag, 0, "Time to live, if not provided defaults to the zone's default TTL") cmd.Flags().StringSlice(recordFlag, []string{}, "Records belonging to the record set") - cmd.Flags().Var(flags.EnumFlag(false, defaultType, typeFlagOptions...), typeFlag, fmt.Sprintf("Record type, one of %q", typeFlagOptions)) + cmd.Flags().Var(flags.EnumFlag(false, string(defaultType), typeFlagOptions...), typeFlag, fmt.Sprintf("Record type, one of %q", typeFlagOptions)) err := flags.MarkFlagsRequired(cmd, zoneIdFlag, nameFlag, recordFlag) cobra.CheckErr(err) @@ -128,6 +131,8 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) { return nil, &errors.ProjectIdError{} } + recordType := flags.FlagWithDefaultToStringValue(p, cmd, typeFlag) + model := inputModel{ GlobalFlagModel: globalFlags, ZoneId: flags.FlagToStringValue(p, cmd, zoneIdFlag), @@ -135,7 +140,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) { Name: flags.FlagToStringPointer(p, cmd, nameFlag), Records: flags.FlagToStringSliceValue(p, cmd, recordFlag), TTL: flags.FlagToInt64Pointer(p, cmd, ttlFlag), - Type: flags.FlagWithDefaultToStringValue(p, cmd, typeFlag), + Type: dns.CreateRecordSetPayloadTypes(recordType), } if model.Type == txtType { diff --git a/internal/cmd/dns/record-set/create/create_test.go b/internal/cmd/dns/record-set/create/create_test.go index 99a216aeb..789e46626 100644 --- a/internal/cmd/dns/record-set/create/create_test.go +++ b/internal/cmd/dns/record-set/create/create_test.go @@ -75,7 +75,7 @@ func fixtureRequest(mods ...func(request *dns.ApiCreateRecordSetRequest)) dns.Ap {Content: utils.Ptr("1.1.1.1")}, }, Ttl: utils.Ptr(int64(3600)), - Type: utils.Ptr("SOA"), + Type: dns.CREATERECORDSETPAYLOADTYPE_SOA.Ptr(), }) for _, mod := range mods { mod(&request) @@ -247,7 +247,7 @@ func TestParseInput(t *testing.T) { { description: "TXT record with > 255 characters", flagValues: fixtureFlagValues(func(flagValues map[string]string) { - flagValues[typeFlag] = txtType + flagValues[typeFlag] = string(txtType) flagValues[recordFlag] = strings.Join(recordTxtOver255Char, "") }), isValid: true, diff --git a/internal/cmd/dns/zone/create/create.go b/internal/cmd/dns/zone/create/create.go index 4855e4337..081602f18 100644 --- a/internal/cmd/dns/zone/create/create.go +++ b/internal/cmd/dns/zone/create/create.go @@ -46,7 +46,7 @@ type inputModel struct { DefaultTTL *int64 Primaries *[]string Acl *string - Type *string + Type *dns.CreateZonePayloadTypes RetryTime *int64 RefreshTime *int64 NegativeCache *int64 @@ -124,12 +124,17 @@ func NewCmd(params *params.CmdParams) *cobra.Command { } func configureFlags(cmd *cobra.Command) { + var typeFlagOptions []string + for _, val := range dns.AllowedCreateZonePayloadTypesEnumValues { + typeFlagOptions = append(typeFlagOptions, string(val)) + } + cmd.Flags().String(nameFlag, "", "User given name of the zone") cmd.Flags().String(dnsNameFlag, "", "Fully qualified domain name of the DNS zone") cmd.Flags().Int64(defaultTTLFlag, 1000, "Default time to live") cmd.Flags().StringSlice(primaryFlag, []string{}, "Primary name server for secondary zone") cmd.Flags().String(aclFlag, "", "Access control list") - cmd.Flags().String(typeFlag, "", "Zone type") + cmd.Flags().Var(flags.EnumFlag(false, "", append(typeFlagOptions, "")...), typeFlag, fmt.Sprintf("Zone type, one of: %q", typeFlagOptions)) cmd.Flags().Int64(retryTimeFlag, 0, "Retry time") cmd.Flags().Int64(refreshTimeFlag, 0, "Refresh time") cmd.Flags().Int64(negativeCacheFlag, 0, "Negative cache") @@ -148,6 +153,11 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) { return nil, &errors.ProjectIdError{} } + var zoneType *dns.CreateZonePayloadTypes + if zoneTypeString := flags.FlagToStringPointer(p, cmd, typeFlag); zoneTypeString != nil && *zoneTypeString != "" { + zoneType = dns.CreateZonePayloadTypes(*zoneTypeString).Ptr() + } + model := inputModel{ GlobalFlagModel: globalFlags, Name: flags.FlagToStringPointer(p, cmd, nameFlag), @@ -155,7 +165,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) { DefaultTTL: flags.FlagToInt64Pointer(p, cmd, defaultTTLFlag), Primaries: flags.FlagToStringSlicePointer(p, cmd, primaryFlag), Acl: flags.FlagToStringPointer(p, cmd, aclFlag), - Type: flags.FlagToStringPointer(p, cmd, typeFlag), + Type: zoneType, RetryTime: flags.FlagToInt64Pointer(p, cmd, retryTimeFlag), RefreshTime: flags.FlagToInt64Pointer(p, cmd, refreshTimeFlag), NegativeCache: flags.FlagToInt64Pointer(p, cmd, negativeCacheFlag), diff --git a/internal/cmd/dns/zone/create/create_test.go b/internal/cmd/dns/zone/create/create_test.go index 39412b8ac..536711d80 100644 --- a/internal/cmd/dns/zone/create/create_test.go +++ b/internal/cmd/dns/zone/create/create_test.go @@ -29,7 +29,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st dnsNameFlag: "example.com", defaultTTLFlag: "3600", aclFlag: "0.0.0.0/0", - typeFlag: "master", + typeFlag: string(dns.CREATEZONEPAYLOADTYPE_PRIMARY), primaryFlag: "1.1.1.1", retryTimeFlag: "600", refreshTimeFlag: "3600", @@ -56,7 +56,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel { DefaultTTL: utils.Ptr(int64(3600)), Primaries: utils.Ptr([]string{"1.1.1.1"}), Acl: utils.Ptr("0.0.0.0/0"), - Type: utils.Ptr("master"), + Type: dns.CREATEZONEPAYLOADTYPE_PRIMARY.Ptr(), RetryTime: utils.Ptr(int64(600)), RefreshTime: utils.Ptr(int64(3600)), NegativeCache: utils.Ptr(int64(60)), @@ -79,7 +79,7 @@ func fixtureRequest(mods ...func(request *dns.ApiCreateZoneRequest)) dns.ApiCrea DefaultTTL: utils.Ptr(int64(3600)), Primaries: utils.Ptr([]string{"1.1.1.1"}), Acl: utils.Ptr("0.0.0.0/0"), - Type: utils.Ptr("master"), + Type: dns.CREATEZONEPAYLOADTYPE_PRIMARY.Ptr(), RetryTime: utils.Ptr(int64(600)), RefreshTime: utils.Ptr(int64(3600)), NegativeCache: utils.Ptr(int64(60)), @@ -139,7 +139,6 @@ func TestParseInput(t *testing.T) { defaultTTLFlag: "0", aclFlag: "", typeFlag: "", - primaryFlag: "", retryTimeFlag: "0", refreshTimeFlag: "0", negativeCacheFlag: "0", @@ -157,9 +156,9 @@ func TestParseInput(t *testing.T) { Name: utils.Ptr(""), DnsName: utils.Ptr(""), DefaultTTL: utils.Ptr(int64(0)), - Primaries: utils.Ptr([]string{}), + Primaries: nil, Acl: utils.Ptr(""), - Type: utils.Ptr(""), + Type: nil, RetryTime: utils.Ptr(int64(0)), RefreshTime: utils.Ptr(int64(0)), NegativeCache: utils.Ptr(int64(0)), diff --git a/internal/cmd/load-balancer/create/create_test.go b/internal/cmd/load-balancer/create/create_test.go index eca1281a8..66cdb2754 100644 --- a/internal/cmd/load-balancer/create/create_test.go +++ b/internal/cmd/load-balancer/create/create_test.go @@ -36,7 +36,7 @@ var testPayload = &loadbalancer.CreateLoadBalancerPayload{ { DisplayName: utils.Ptr(""), Port: utils.Ptr(int64(0)), - Protocol: utils.Ptr(""), + Protocol: loadbalancer.ListenerProtocol("").Ptr(), ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ { Name: utils.Ptr(""), @@ -55,7 +55,7 @@ var testPayload = &loadbalancer.CreateLoadBalancerPayload{ Networks: &[]loadbalancer.Network{ { NetworkId: utils.Ptr(""), - Role: utils.Ptr(""), + Role: loadbalancer.NetworkRole("").Ptr(), }, }, Options: &loadbalancer.LoadBalancerOptions{ diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload.go b/internal/cmd/load-balancer/generate-payload/generate_payload.go index 1197cf7a9..42cbb4a59 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload.go @@ -35,7 +35,7 @@ var ( defaultPayloadListener = &loadbalancer.Listener{ DisplayName: utils.Ptr(""), Port: utils.Ptr(int64(0)), - Protocol: utils.Ptr(""), + Protocol: loadbalancer.ListenerProtocol("").Ptr(), ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ { Name: utils.Ptr(""), @@ -52,7 +52,7 @@ var ( defaultPayloadNetwork = &loadbalancer.Network{ NetworkId: utils.Ptr(""), - Role: utils.Ptr(""), + Role: loadbalancer.NetworkRole("").Ptr(), } defaultPayloadTargetPool = &loadbalancer.TargetPool{ diff --git a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go index 5943215b8..66a0891ec 100644 --- a/internal/cmd/load-balancer/generate-payload/generate_payload_test.go +++ b/internal/cmd/load-balancer/generate-payload/generate_payload_test.go @@ -226,7 +226,7 @@ func TestModifyListeners(t *testing.T) { { DisplayName: utils.Ptr(""), Port: utils.Ptr(int64(0)), - Protocol: utils.Ptr(""), + Protocol: loadbalancer.ListenerProtocol("").Ptr(), Name: utils.Ptr(""), ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ { @@ -244,7 +244,7 @@ func TestModifyListeners(t *testing.T) { { DisplayName: utils.Ptr(""), Port: utils.Ptr(int64(0)), - Protocol: utils.Ptr(""), + Protocol: loadbalancer.ListenerProtocol("").Ptr(), Name: utils.Ptr(""), ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ { @@ -265,7 +265,7 @@ func TestModifyListeners(t *testing.T) { { DisplayName: utils.Ptr(""), Port: utils.Ptr(int64(0)), - Protocol: utils.Ptr(""), + Protocol: loadbalancer.ListenerProtocol("").Ptr(), Name: nil, ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ { @@ -283,7 +283,7 @@ func TestModifyListeners(t *testing.T) { { DisplayName: utils.Ptr(""), Port: utils.Ptr(int64(0)), - Protocol: utils.Ptr(""), + Protocol: loadbalancer.ListenerProtocol("").Ptr(), Name: nil, ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ { diff --git a/internal/cmd/load-balancer/update/update_test.go b/internal/cmd/load-balancer/update/update_test.go index 9d97f07fc..b57d57336 100644 --- a/internal/cmd/load-balancer/update/update_test.go +++ b/internal/cmd/load-balancer/update/update_test.go @@ -33,7 +33,7 @@ var testPayload = loadbalancer.UpdateLoadBalancerPayload{ { DisplayName: utils.Ptr(""), Port: utils.Ptr(int64(0)), - Protocol: utils.Ptr(""), + Protocol: loadbalancer.ListenerProtocol("").Ptr(), ServerNameIndicators: &[]loadbalancer.ServerNameIndicator{ { Name: utils.Ptr(""), @@ -52,7 +52,7 @@ var testPayload = loadbalancer.UpdateLoadBalancerPayload{ Networks: &[]loadbalancer.Network{ { NetworkId: utils.Ptr(""), - Role: utils.Ptr(""), + Role: loadbalancer.NetworkRole("").Ptr(), }, }, Options: &loadbalancer.LoadBalancerOptions{ diff --git a/internal/cmd/observability/scrape-config/create/create_test.go b/internal/cmd/observability/scrape-config/create/create_test.go index 54c0573e3..285e5406d 100644 --- a/internal/cmd/observability/scrape-config/create/create_test.go +++ b/internal/cmd/observability/scrape-config/create/create_test.go @@ -34,7 +34,7 @@ var testPayload = &observability.CreateScrapeConfigPayload{ JobName: utils.Ptr("default-name"), MetricsRelabelConfigs: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{ { - Action: utils.Ptr("replace"), + Action: observability.CREATESCRAPECONFIGPAYLOADMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(), Modulus: utils.Ptr(1.0), Regex: utils.Ptr("regex"), Replacement: utils.Ptr("replacement"), @@ -48,7 +48,7 @@ var testPayload = &observability.CreateScrapeConfigPayload{ "key2": []interface{}{}, }, SampleLimit: utils.Ptr(1.0), - Scheme: utils.Ptr("scheme"), + Scheme: observability.CREATESCRAPECONFIGPAYLOADSCHEME_HTTPS.Ptr(), ScrapeInterval: utils.Ptr("interval"), ScrapeTimeout: utils.Ptr("timeout"), StaticConfigs: &[]observability.CreateScrapeConfigPayloadStaticConfigsInner{ @@ -95,7 +95,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "key2": [] }, "sampleLimit": 1.0, - "scheme": "scheme", + "scheme": "https", "scrapeInterval": "interval", "scrapeTimeout": "timeout", "staticConfigs": [ diff --git a/internal/cmd/observability/scrape-config/update/update_test.go b/internal/cmd/observability/scrape-config/update/update_test.go index ad5870231..595b4f09e 100644 --- a/internal/cmd/observability/scrape-config/update/update_test.go +++ b/internal/cmd/observability/scrape-config/update/update_test.go @@ -34,7 +34,7 @@ var testPayload = observability.UpdateScrapeConfigPayload{ MetricsPath: utils.Ptr("/metrics"), MetricsRelabelConfigs: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{ { - Action: utils.Ptr("replace"), + Action: observability.CREATESCRAPECONFIGPAYLOADMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(), Modulus: utils.Ptr(1.0), Regex: utils.Ptr("regex"), Replacement: utils.Ptr("replacement"), diff --git a/internal/cmd/ske/cluster/create/create_test.go b/internal/cmd/ske/cluster/create/create_test.go index 3cc543398..5988ea195 100644 --- a/internal/cmd/ske/cluster/create/create_test.go +++ b/internal/cmd/ske/cluster/create/create_test.go @@ -47,7 +47,7 @@ var testPayload = &ske.CreateOrUpdateClusterPayload{ Size: utils.Ptr(int64(40)), }, AvailabilityZones: &[]string{"eu01-3"}, - Cri: &ske.CRI{Name: utils.Ptr("cri")}, + Cri: &ske.CRI{Name: ske.CRINAME_DOCKER.Ptr()}, }, }, Extensions: &ske.Extension{ @@ -100,7 +100,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "maximum": 2, "maxSurge": 1, "volume": { "type": "storage_premium_perf0", "size": 40 }, - "cri": { "name": "cri" }, + "cri": { "name": "docker" }, "availabilityZones": ["eu01-3"] } ], diff --git a/internal/cmd/ske/cluster/update/update_test.go b/internal/cmd/ske/cluster/update/update_test.go index e4ec07b3f..722234099 100644 --- a/internal/cmd/ske/cluster/update/update_test.go +++ b/internal/cmd/ske/cluster/update/update_test.go @@ -47,7 +47,7 @@ var testPayload = ske.CreateOrUpdateClusterPayload{ Size: utils.Ptr(int64(40)), }, AvailabilityZones: &[]string{"eu01-3"}, - Cri: &ske.CRI{Name: utils.Ptr("cri")}, + Cri: &ske.CRI{Name: ske.CRINAME_DOCKER.Ptr()}, }, }, Extensions: &ske.Extension{ @@ -100,7 +100,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "maximum": 2, "maxSurge": 1, "volume": { "type": "storage_premium_perf0", "size": 40 }, - "cri": { "name": "cri" }, + "cri": { "name": "docker" }, "availabilityZones": ["eu01-3"] } ], diff --git a/internal/cmd/ske/options/options.go b/internal/cmd/ske/options/options.go index 0608e5a7d..dbcfa7613 100644 --- a/internal/cmd/ske/options/options.go +++ b/internal/cmd/ske/options/options.go @@ -275,7 +275,7 @@ func buildMachineImagesTable(resp *ske.ProviderOptions) tables.Table { criNames := make([]string, 0) for i := range *version.Cri { cri := (*version.Cri)[i] - criNames = append(criNames, *cri.Name) + criNames = append(criNames, string(*cri.Name)) } criNamesString := strings.Join(criNames, ", ") diff --git a/internal/pkg/services/dns/utils/utils.go b/internal/pkg/services/dns/utils/utils.go index 351cf2e47..141fb50e0 100644 --- a/internal/pkg/services/dns/utils/utils.go +++ b/internal/pkg/services/dns/utils/utils.go @@ -35,7 +35,7 @@ func GetRecordSetType(ctx context.Context, apiClient DNSClient, projectId, zoneI if err != nil { return utils.Ptr(""), fmt.Errorf("get DNS recordset: %w", err) } - return resp.Rrset.Type, nil + return (*string)(resp.Rrset.Type), nil } func FormatTxtRecord(input string) (string, error) { diff --git a/internal/pkg/services/observability/utils/utils.go b/internal/pkg/services/observability/utils/utils.go index fef48457e..234da09be 100644 --- a/internal/pkg/services/observability/utils/utils.go +++ b/internal/pkg/services/observability/utils/utils.go @@ -31,7 +31,7 @@ var ( DefaultCreateScrapeConfigPayload = observability.CreateScrapeConfigPayload{ JobName: utils.Ptr("default-name"), MetricsPath: utils.Ptr("/metrics"), - Scheme: utils.Ptr("https"), + Scheme: observability.CREATESCRAPECONFIGPAYLOADSCHEME_HTTPS.Ptr(), ScrapeInterval: utils.Ptr("5m"), ScrapeTimeout: utils.Ptr("2m"), StaticConfigs: utils.Ptr(defaultStaticConfigs), @@ -106,7 +106,7 @@ func MapToUpdateScrapeConfigPayload(resp *observability.GetScrapeConfigResponse) MetricsRelabelConfigs: metricsRelabelConfigs, Params: params, SampleLimit: utils.ConvertInt64PToFloat64P(data.SampleLimit), - Scheme: data.Scheme, + Scheme: observability.UpdateScrapeConfigPayloadGetSchemeAttributeType(data.Scheme), ScrapeInterval: data.ScrapeInterval, ScrapeTimeout: data.ScrapeTimeout, StaticConfigs: staticConfigs, @@ -127,7 +127,7 @@ func mapMetricsRelabelConfig(metricsRelabelConfigs *[]observability.MetricsRelab var mappedConfigs []observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner for _, config := range *metricsRelabelConfigs { mappedConfig := observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{ - Action: config.Action, + Action: observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInnerGetActionAttributeType(config.Action), Modulus: utils.ConvertInt64PToFloat64P(config.Modulus), Regex: config.Regex, Replacement: config.Replacement, diff --git a/internal/pkg/services/observability/utils/utils_test.go b/internal/pkg/services/observability/utils/utils_test.go index 36484e547..0b5083aad 100644 --- a/internal/pkg/services/observability/utils/utils_test.go +++ b/internal/pkg/services/observability/utils/utils_test.go @@ -48,7 +48,7 @@ func fixtureGetScrapeConfigResponse(mods ...func(*observability.GetScrapeConfigR MetricsPath: utils.Ptr("/metrics"), MetricsRelabelConfigs: &[]observability.MetricsRelabelConfig{ { - Action: utils.Ptr("replace"), + Action: observability.METRICSRELABELCONFIGACTION_REPLACE.Ptr(), Modulus: &number, Regex: utils.Ptr("regex"), Replacement: utils.Ptr("replacement"), @@ -62,7 +62,7 @@ func fixtureGetScrapeConfigResponse(mods ...func(*observability.GetScrapeConfigR "key2": {}, }, SampleLimit: &number, - Scheme: utils.Ptr("scheme"), + Scheme: observability.JOBSCHEME_HTTP.Ptr(), ScrapeInterval: utils.Ptr("interval"), ScrapeTimeout: utils.Ptr("timeout"), StaticConfigs: &[]observability.StaticConfigs{ @@ -99,7 +99,7 @@ func fixtureUpdateScrapeConfigPayload(mods ...func(*observability.UpdateScrapeCo MetricsPath: utils.Ptr("/metrics"), MetricsRelabelConfigs: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{ { - Action: utils.Ptr("replace"), + Action: utils.Ptr(observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInnerAction("replace")), Modulus: utils.Ptr(1.0), Regex: utils.Ptr("regex"), Replacement: utils.Ptr("replacement"), @@ -113,7 +113,7 @@ func fixtureUpdateScrapeConfigPayload(mods ...func(*observability.UpdateScrapeCo "key2": []string{}, }, SampleLimit: utils.Ptr(1.0), - Scheme: utils.Ptr("scheme"), + Scheme: observability.UPDATESCRAPECONFIGPAYLOADSCHEME_HTTP.Ptr(), ScrapeInterval: utils.Ptr("interval"), ScrapeTimeout: utils.Ptr("timeout"), StaticConfigs: &[]observability.UpdateScrapeConfigPayloadStaticConfigsInner{ @@ -432,7 +432,7 @@ func TestMapMetricsRelabelConfig(t *testing.T) { description: "base case", config: &[]observability.MetricsRelabelConfig{ { - Action: utils.Ptr("replace"), + Action: observability.METRICSRELABELCONFIGACTION_REPLACE.Ptr(), Modulus: utils.Int64Ptr(1), Regex: utils.Ptr("regex"), Replacement: utils.Ptr("replacement"), @@ -443,7 +443,7 @@ func TestMapMetricsRelabelConfig(t *testing.T) { }, expected: &[]observability.CreateScrapeConfigPayloadMetricsRelabelConfigsInner{ { - Action: utils.Ptr("replace"), + Action: observability.CREATESCRAPECONFIGPAYLOADMETRICSRELABELCONFIGSINNERACTION_REPLACE.Ptr(), Modulus: utils.Float64Ptr(1.0), Regex: utils.Ptr("regex"), Replacement: utils.Ptr("replacement"), diff --git a/internal/pkg/services/serverbackup/utils/utils_test.go b/internal/pkg/services/serverbackup/utils/utils_test.go index b9ca14087..73b915b3a 100644 --- a/internal/pkg/services/serverbackup/utils/utils_test.go +++ b/internal/pkg/services/serverbackup/utils/utils_test.go @@ -88,7 +88,7 @@ func TestCanDisableBackupService(t *testing.T) { LastRestoredAt: utils.Ptr("test timestamp"), Name: utils.Ptr("test name"), Size: utils.Ptr(int64(5)), - Status: utils.Ptr("test status"), + Status: serverbackup.BACKUPSTATUS_BACKING_UP.Ptr(), VolumeBackups: nil, }, }, diff --git a/internal/pkg/services/service-enablement/utils/utils.go b/internal/pkg/services/service-enablement/utils/utils.go index a6e29254c..5f1976164 100644 --- a/internal/pkg/services/service-enablement/utils/utils.go +++ b/internal/pkg/services/service-enablement/utils/utils.go @@ -6,7 +6,6 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/oapierror" "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement" - "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait" ) const ( @@ -29,5 +28,5 @@ func ProjectEnabled(ctx context.Context, apiClient ServiceEnablementClient, proj } return false, err } - return *project.State == wait.ServiceStateEnabled, nil + return *project.State == serviceenablement.SERVICESTATUSSTATE_ENABLED, nil } diff --git a/internal/pkg/services/service-enablement/utils/utils_test.go b/internal/pkg/services/service-enablement/utils/utils_test.go index 3c364847a..b898adb69 100644 --- a/internal/pkg/services/service-enablement/utils/utils_test.go +++ b/internal/pkg/services/service-enablement/utils/utils_test.go @@ -5,12 +5,9 @@ import ( "fmt" "testing" - "github.com/stackitcloud/stackit-cli/internal/pkg/utils" - "github.com/google/uuid" "github.com/stackitcloud/stackit-sdk-go/core/oapierror" "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement" - "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/wait" ) var ( @@ -45,7 +42,7 @@ func TestProjectEnabled(t *testing.T) { }{ { description: "project enabled", - getProjectResp: &serviceenablement.ServiceStatus{State: utils.Ptr(wait.ServiceStateEnabled)}, + getProjectResp: &serviceenablement.ServiceStatus{State: serviceenablement.SERVICESTATUSSTATE_ENABLED.Ptr()}, isValid: true, expectedOutput: true, }, @@ -57,19 +54,19 @@ func TestProjectEnabled(t *testing.T) { }, { description: "project disabled 1", - getProjectResp: &serviceenablement.ServiceStatus{State: utils.Ptr(wait.ServiceStateEnabling)}, + getProjectResp: &serviceenablement.ServiceStatus{State: serviceenablement.SERVICESTATUSSTATE_ENABLING.Ptr()}, isValid: true, expectedOutput: false, }, { description: "project disabled 2", - getProjectResp: &serviceenablement.ServiceStatus{State: utils.Ptr(wait.ServiceStateDisabled)}, + getProjectResp: &serviceenablement.ServiceStatus{State: serviceenablement.SERVICESTATUSSTATE_DISABLING.Ptr()}, isValid: true, expectedOutput: false, }, { description: "project disabled 3", - getProjectResp: &serviceenablement.ServiceStatus{State: utils.Ptr(wait.ServiceStateDisabling)}, + getProjectResp: &serviceenablement.ServiceStatus{State: serviceenablement.SERVICESTATUSSTATE_DISABLING.Ptr()}, isValid: true, expectedOutput: false, }, diff --git a/internal/pkg/services/ske/utils/utils.go b/internal/pkg/services/ske/utils/utils.go index 452d4b584..283760f63 100644 --- a/internal/pkg/services/ske/utils/utils.go +++ b/internal/pkg/services/ske/utils/utils.go @@ -17,7 +17,7 @@ import ( const ( defaultNodepoolAvailabilityZone = "eu01-3" - defaultNodepoolCRI = "containerd" + defaultNodepoolCRI = ske.CRINAME_CONTAINERD defaultNodepoolMachineType = "b1.2" defaultNodepoolMachineImageName = "flatcar" defaultNodepoolMaxSurge = 1 diff --git a/internal/pkg/services/ske/utils/utils_test.go b/internal/pkg/services/ske/utils/utils_test.go index e19c16116..9c6c37ace 100644 --- a/internal/pkg/services/ske/utils/utils_test.go +++ b/internal/pkg/services/ske/utils/utils_test.go @@ -167,10 +167,10 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt Version: utils.Ptr("1.2.3"), Cri: &[]ske.CRI{ { - Name: utils.Ptr("not-containerd"), + Name: ske.CRINAME_DOCKER.Ptr(), }, { - Name: utils.Ptr("containerd"), + Name: ske.CRINAME_CONTAINERD.Ptr(), }, }, }, @@ -179,10 +179,10 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt Version: utils.Ptr("3.2.1"), Cri: &[]ske.CRI{ { - Name: utils.Ptr("not-containerd"), + Name: ske.CRINAME_DOCKER.Ptr(), }, { - Name: utils.Ptr("containerd"), + Name: ske.CRINAME_CONTAINERD.Ptr(), }, }, }, @@ -196,7 +196,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt Version: utils.Ptr("4.4.4"), Cri: &[]ske.CRI{ { - Name: utils.Ptr("containerd"), + Name: ske.CRINAME_CONTAINERD.Ptr(), }, }, }, @@ -219,7 +219,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt Version: utils.Ptr("4.4.4"), Cri: &[]ske.CRI{ { - Name: utils.Ptr("containerd"), + Name: ske.CRINAME_CONTAINERD.Ptr(), }, }, }, @@ -233,7 +233,7 @@ func fixtureProviderOptions(mods ...func(*ske.ProviderOptions)) *ske.ProviderOpt Version: utils.Ptr("4.4.4"), Cri: &[]ske.CRI{ { - Name: utils.Ptr("not-containerd"), + Name: ske.CRINAME_DOCKER.Ptr(), }, }, }, @@ -264,7 +264,7 @@ func fixtureGetDefaultPayload(mods ...func(*ske.CreateOrUpdateClusterPayload)) * "eu01-3", }, Cri: &ske.CRI{ - Name: utils.Ptr("containerd"), + Name: ske.CRINAME_CONTAINERD.Ptr(), }, Machine: &ske.Machine{ Type: utils.Ptr("b1.2"), From bbfafaa532c1c2b1e2611cd967ec944531db3a5b Mon Sep 17 00:00:00 2001 From: Marcel Jacek Date: Tue, 20 May 2025 09:13:19 +0200 Subject: [PATCH 3/4] fix: go.mod --- go.sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.sum b/go.sum index 5a61dae2f..379df0bdd 100644 --- a/go.sum +++ b/go.sum @@ -578,7 +578,7 @@ github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.1.0 h1:9gUobm//G github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.1.0/go.mod h1:h3oM6cS23Yfynp8Df1hNr0FxtY5Alii/2g8Wqi5SIVE= github.com/stackitcloud/stackit-sdk-go/services/logme v0.23.0 h1:ksxHeILZutooun0Hy/cY8qikC9owya1UDJR+FSQSlRw= github.com/stackitcloud/stackit-sdk-go/services/logme v0.23.0/go.mod h1:+3jizYma6Dq3XVn6EMMdSBF9eIm0w6hCJvrStB3AIL0= -gthub.com/stackitcloud/stackit-sdk-go/services/mariadb v0.24.0 h1:t/Ten9AuoWFmrDq5gAI3kVZShF3i8zEAaeBsYYqiaao= +github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.24.0 h1:t/Ten9AuoWFmrDq5gAI3kVZShF3i8zEAaeBsYYqiaao= github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.24.0/go.mod h1:qgvi3qiAzB1wKpMJ5CPnEaUToeiwgnQxGvlkjdisaLU= github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.0 h1:U/IhjLOz0vG6zuxTqGhBd8f609s6JB+X9PaL6x/VM58= github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.2.0/go.mod h1:+JSnz5/AvGN5ek/iH008frRc/NgjSr1EVOTIbyLwAuQ= From ac78ba687b96a7f765c98db073a9c948aaad358e Mon Sep 17 00:00:00 2001 From: Marcel Jacek Date: Tue, 20 May 2025 15:28:43 +0200 Subject: [PATCH 4/4] implement review findings --- .../cmd/observability/scrape-config/create/create_test.go | 7 ++++--- internal/cmd/ske/cluster/create/create_test.go | 7 ++++--- internal/cmd/ske/cluster/update/update_test.go | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/internal/cmd/observability/scrape-config/create/create_test.go b/internal/cmd/observability/scrape-config/create/create_test.go index 285e5406d..533bf457b 100644 --- a/internal/cmd/observability/scrape-config/create/create_test.go +++ b/internal/cmd/observability/scrape-config/create/create_test.go @@ -2,6 +2,7 @@ package create import ( "context" + "fmt" "testing" "github.com/stackitcloud/stackit-cli/internal/pkg/globalflags" @@ -69,7 +70,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st flagValues := map[string]string{ projectIdFlag: testProjectId, instanceIdFlag: testInstanceId, - payloadFlag: `{ + payloadFlag: fmt.Sprintf(`{ "jobName": "default-name", "basicAuth": { "username": "username", @@ -95,7 +96,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "key2": [] }, "sampleLimit": 1.0, - "scheme": "https", + "scheme": "%s", "scrapeInterval": "interval", "scrapeTimeout": "timeout", "staticConfigs": [ @@ -110,7 +111,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "tlsConfig": { "insecureSkipVerify": true } - }`, + }`, observability.CREATESCRAPECONFIGPAYLOADSCHEME_HTTPS), } for _, mod := range mods { mod(flagValues) diff --git a/internal/cmd/ske/cluster/create/create_test.go b/internal/cmd/ske/cluster/create/create_test.go index 5988ea195..f64a03eb1 100644 --- a/internal/cmd/ske/cluster/create/create_test.go +++ b/internal/cmd/ske/cluster/create/create_test.go @@ -2,6 +2,7 @@ package create import ( "context" + "fmt" "testing" "time" @@ -81,7 +82,7 @@ func fixtureArgValues(mods ...func(argValues []string)) []string { func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { flagValues := map[string]string{ projectIdFlag: testProjectId, - payloadFlag: `{ + payloadFlag: fmt.Sprintf(`{ "name": "cli-jp", "kubernetes": { "version": "1.25.15" @@ -100,7 +101,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "maximum": 2, "maxSurge": 1, "volume": { "type": "storage_premium_perf0", "size": 40 }, - "cri": { "name": "docker" }, + "cri": { "name": "%s" }, "availabilityZones": ["eu01-3"] } ], @@ -115,7 +116,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "start": "0000-01-01T03:00:00+02:00" } } - }`, + }`, ske.CRINAME_DOCKER), } for _, mod := range mods { mod(flagValues) diff --git a/internal/cmd/ske/cluster/update/update_test.go b/internal/cmd/ske/cluster/update/update_test.go index 722234099..8eab71453 100644 --- a/internal/cmd/ske/cluster/update/update_test.go +++ b/internal/cmd/ske/cluster/update/update_test.go @@ -2,6 +2,7 @@ package update import ( "context" + "fmt" "testing" "time" @@ -81,7 +82,7 @@ func fixtureArgValues(mods ...func(argValues []string)) []string { func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string { flagValues := map[string]string{ projectIdFlag: testProjectId, - payloadFlag: `{ + payloadFlag: fmt.Sprintf(`{ "name": "cli-jp", "kubernetes": { "version": "1.25.15" @@ -100,7 +101,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "maximum": 2, "maxSurge": 1, "volume": { "type": "storage_premium_perf0", "size": 40 }, - "cri": { "name": "docker" }, + "cri": { "name": "%s" }, "availabilityZones": ["eu01-3"] } ], @@ -115,7 +116,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st "start": "0000-01-01T03:00:00+02:00" } } - }`, + }`, ske.CRINAME_DOCKER), } for _, mod := range mods { mod(flagValues)