diff --git a/go.mod b/go.mod index f8f2554f5..2339c9453 100644 --- a/go.mod +++ b/go.mod @@ -14,37 +14,37 @@ require ( github.com/hashicorp/terraform-plugin-testing v1.16.0 github.com/stackitcloud/stackit-sdk-go/core v0.26.0 github.com/stackitcloud/stackit-sdk-go/services/alb v0.15.0 - github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0 - github.com/stackitcloud/stackit-sdk-go/services/certificates v1.7.0 - github.com/stackitcloud/stackit-sdk-go/services/dns v0.20.2 + github.com/stackitcloud/stackit-sdk-go/services/cdn v1.18.0 + github.com/stackitcloud/stackit-sdk-go/services/certificates v1.8.0 + github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0 github.com/stackitcloud/stackit-sdk-go/services/dremio v0.3.0 - github.com/stackitcloud/stackit-sdk-go/services/edge v0.11.0 - github.com/stackitcloud/stackit-sdk-go/services/git v0.13.0 + github.com/stackitcloud/stackit-sdk-go/services/edge v0.12.0 + github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0 github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0 - github.com/stackitcloud/stackit-sdk-go/services/intake v0.9.0 - github.com/stackitcloud/stackit-sdk-go/services/kms v1.10.0 + github.com/stackitcloud/stackit-sdk-go/services/intake v0.11.0 + github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0 - github.com/stackitcloud/stackit-sdk-go/services/logme v0.29.0 - github.com/stackitcloud/stackit-sdk-go/services/logs v0.9.0 - github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.29.0 - github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.10.0 - github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.10.0 + github.com/stackitcloud/stackit-sdk-go/services/logme v1.0.0 + github.com/stackitcloud/stackit-sdk-go/services/logs v0.10.0 + github.com/stackitcloud/stackit-sdk-go/services/mariadb v1.0.0 + github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.11.0 + github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.11.0 github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.9.0 - github.com/stackitcloud/stackit-sdk-go/services/observability v0.23.0 + github.com/stackitcloud/stackit-sdk-go/services/observability v0.24.0 github.com/stackitcloud/stackit-sdk-go/services/opensearch v1.0.0 - github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.9.0 - github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.30.0 - github.com/stackitcloud/stackit-sdk-go/services/redis v0.28.2 - github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.23.0 + github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.10.0 + github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v1.0.0 + github.com/stackitcloud/stackit-sdk-go/services/redis v1.0.0 + github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0 github.com/stackitcloud/stackit-sdk-go/services/scf v0.9.0 github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.18.1 - github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.2 + github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.7.0 github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2 - github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.19.0 - github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.6.0 - github.com/stackitcloud/stackit-sdk-go/services/sfs v0.10.1 + github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.20.0 + github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0 + github.com/stackitcloud/stackit-sdk-go/services/sfs v0.11.0 github.com/stackitcloud/stackit-sdk-go/services/ske v1.18.0 - github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0 + github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.13.0 github.com/stackitcloud/stackit-sdk-go/services/telemetrylink v0.2.0 github.com/stackitcloud/stackit-sdk-go/services/telemetryrouter v0.3.0 github.com/stackitcloud/stackit-sdk-go/services/vpn v0.14.0 diff --git a/go.sum b/go.sum index 09c64adf3..99763d1c5 100644 --- a/go.sum +++ b/go.sum @@ -674,68 +674,68 @@ github.com/stackitcloud/stackit-sdk-go/services/alb v0.15.0 h1:GDiNrm0A1KIHARcx6 github.com/stackitcloud/stackit-sdk-go/services/alb v0.15.0/go.mod h1:eK6oRB5Tmpt6KbXQ4UYBGg2LgW5bPtVoncL9E8JSRww= github.com/stackitcloud/stackit-sdk-go/services/authorization v0.15.2 h1:b7WJ/vwxlVmNNX91kI3obqGcuoPAyaCbDL5aCMQ/sNg= github.com/stackitcloud/stackit-sdk-go/services/authorization v0.15.2/go.mod h1:T/JF25XGJ3GqER/1L2N//DgY8x5tY7gA3N+/0nvmOWY= -github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0 h1:Wqxx0PDTL2F5gqI5jjznuJY0TdqECltjA0aa/rHY63U= -github.com/stackitcloud/stackit-sdk-go/services/cdn v1.16.0/go.mod h1:MHB1N3EQ9GuAduAQoNS+gb1MjrWJieszbpOso9TQv5s= -github.com/stackitcloud/stackit-sdk-go/services/certificates v1.7.0 h1:J7BVVHjRTS5YUyGf6DZEIE1uD9f/S4v9dDbpZWVEd3U= -github.com/stackitcloud/stackit-sdk-go/services/certificates v1.7.0/go.mod h1:eJpB3/pukz+KzVPVHQ4g3DVtQkxGga18VbFBhq9ugdY= -github.com/stackitcloud/stackit-sdk-go/services/dns v0.20.2 h1:nMJRg1dKioOlMwXJnZZgIRwfTWYCksVA9GyfAVmib1g= -github.com/stackitcloud/stackit-sdk-go/services/dns v0.20.2/go.mod h1:FiYSv3D9rzgEVzi8Mpq5oYZBosrasa5uUYqVdEIbM1U= +github.com/stackitcloud/stackit-sdk-go/services/cdn v1.18.0 h1:cEInAiHfsf8l3utWktJHyNLnJ2zeK6X3vzTJu9wBnEc= +github.com/stackitcloud/stackit-sdk-go/services/cdn v1.18.0/go.mod h1:MHB1N3EQ9GuAduAQoNS+gb1MjrWJieszbpOso9TQv5s= +github.com/stackitcloud/stackit-sdk-go/services/certificates v1.8.0 h1:bINitVHAyfFfRhkt8/eXDXEjpuH72n9HykZhthGkEg4= +github.com/stackitcloud/stackit-sdk-go/services/certificates v1.8.0/go.mod h1:eJpB3/pukz+KzVPVHQ4g3DVtQkxGga18VbFBhq9ugdY= +github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0 h1:ZVkptfVCAqpaPWkE+WIopM9XdzqgbVcwmX5L1jZqqx8= +github.com/stackitcloud/stackit-sdk-go/services/dns v0.21.0/go.mod h1:FiYSv3D9rzgEVzi8Mpq5oYZBosrasa5uUYqVdEIbM1U= github.com/stackitcloud/stackit-sdk-go/services/dremio v0.3.0 h1:LKreLAR425+EMYbKrPIAzeoTEQlDF8EpIMTVBpOhjmA= github.com/stackitcloud/stackit-sdk-go/services/dremio v0.3.0/go.mod h1:iMoiM8fM1mXC1Nz8FBiiQ08Yh+0C3yN0GPCdAbOlRXo= -github.com/stackitcloud/stackit-sdk-go/services/edge v0.11.0 h1:/JUxaJSGmg+PRj90e4fngWkXNQkRKHOYpVykJ3zoy7w= -github.com/stackitcloud/stackit-sdk-go/services/edge v0.11.0/go.mod h1:Ylse6gqGJtsd5TVmvha+hoLd1QQHLKvhY5dO15+q5kg= -github.com/stackitcloud/stackit-sdk-go/services/git v0.13.0 h1:BdamSnGYhDkDqUWQQcJ8Kqik90laTK1IlG5CQqyLVgA= -github.com/stackitcloud/stackit-sdk-go/services/git v0.13.0/go.mod h1:YZEL+gaK+ELn5E9VtK8yvz5RcmCBH+JkRpf6YbNVSbM= +github.com/stackitcloud/stackit-sdk-go/services/edge v0.12.0 h1:qPhNo5m0K9ZKMnUx7e23fmvBmhOCxIFRzobwFhSHWUY= +github.com/stackitcloud/stackit-sdk-go/services/edge v0.12.0/go.mod h1:Ylse6gqGJtsd5TVmvha+hoLd1QQHLKvhY5dO15+q5kg= +github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0 h1:VZBneGprCmHqckcSMPs3puBlK8rBpLMtYKmBktwdoVE= +github.com/stackitcloud/stackit-sdk-go/services/git v0.14.0/go.mod h1:YZEL+gaK+ELn5E9VtK8yvz5RcmCBH+JkRpf6YbNVSbM= github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0 h1:H4V3H8qSKOaOalIrf4nAPDHhXnHYGs6SDGuK8Zj41Zo= github.com/stackitcloud/stackit-sdk-go/services/iaas v1.12.0/go.mod h1:Ts06id0KejUlQWbpR+/rm+tKng6QkTuFV1VQTPJ4dA4= -github.com/stackitcloud/stackit-sdk-go/services/intake v0.9.0 h1:vtKZgDNsrZTr8jnQPPLsGV5BHuJa2VroOdeXtgUpGkk= -github.com/stackitcloud/stackit-sdk-go/services/intake v0.9.0/go.mod h1:UXhPs7JXjQvTp14d4ZffSLnFMQyB7y1cj100XWwQudI= -github.com/stackitcloud/stackit-sdk-go/services/kms v1.10.0 h1:/xPQvEaSbysmIKL/wtTYiweEe74P9iCzzyIA7ZHY8FU= -github.com/stackitcloud/stackit-sdk-go/services/kms v1.10.0/go.mod h1:pVaCmb1ZHAPGVRlSlBlVOjThp9Tb2sX9+nRX0M+d1KU= +github.com/stackitcloud/stackit-sdk-go/services/intake v0.11.0 h1:zuZIWgm8ak6aOyvgHouIBSoAnUkNBy4HMSba5AHYI7U= +github.com/stackitcloud/stackit-sdk-go/services/intake v0.11.0/go.mod h1:UXhPs7JXjQvTp14d4ZffSLnFMQyB7y1cj100XWwQudI= +github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0 h1:OrUaDypQNr1nOXZfVQXCwUpN4YhR5y0vtvYi9/Ogoi4= +github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0/go.mod h1:pVaCmb1ZHAPGVRlSlBlVOjThp9Tb2sX9+nRX0M+d1KU= github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0 h1:1dvL7tX91ziklayQmOupniE3jM4D5Nbtc0auNcx2p18= github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.14.0/go.mod h1:+Ld3dn648I+YKcBV3fEkYpDSr3fel421+LurJGywSBs= -github.com/stackitcloud/stackit-sdk-go/services/logme v0.29.0 h1:zsZaPr15UkjLuNhOiF+K7dikhenZAd+sQuEvTlGnkvg= -github.com/stackitcloud/stackit-sdk-go/services/logme v0.29.0/go.mod h1:JDOOYaGgcBts2x52nKPRMFgSZe7qqOFmfz1xIXCQgRY= -github.com/stackitcloud/stackit-sdk-go/services/logs v0.9.0 h1:m/FSPciEqsci1e7Ph2Nn+XyV+1bNPCLDfm1rm42xjAk= -github.com/stackitcloud/stackit-sdk-go/services/logs v0.9.0/go.mod h1:tvRejL8w5KpGBbLFPQ+dXOJURgZ3OMbZmwxlKQrGMuA= -github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.29.0 h1:dLXdQRTVSkb8ttCgimbbW1fvcmMFa2BmRgyxYD2OpFE= -github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.29.0/go.mod h1:joa89Y1dyn0j22FstRcIKfW2ada3FDxNfttxSvq27uY= -github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.10.0 h1:k2mkHQkfzLH53dL1tHZo8pbpu062aQIgQmAw5OSZpss= -github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.10.0/go.mod h1:u7T85YqoqncJevbPU1ODKthbmxxEh1zw+bVaAO8v0Sg= -github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.10.0 h1:lp9qX4sworFipMIKPORxuNZlVHDrpqZLppQN5YKGsP4= -github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.10.0/go.mod h1:0hHEPiOEMAA23EzEl42Rm3FlyKIzkW+LWLvDkuFTZ+Q= +github.com/stackitcloud/stackit-sdk-go/services/logme v1.0.0 h1:DRDcjKXVrF/iN82L7BRDM6EZNZqTj3HKSK5ErcLGxro= +github.com/stackitcloud/stackit-sdk-go/services/logme v1.0.0/go.mod h1:JDOOYaGgcBts2x52nKPRMFgSZe7qqOFmfz1xIXCQgRY= +github.com/stackitcloud/stackit-sdk-go/services/logs v0.10.0 h1:g7zpfQFFq3UhAWrMK9rPaZY6dLMAuMJf5g6+r7VRTXc= +github.com/stackitcloud/stackit-sdk-go/services/logs v0.10.0/go.mod h1:tvRejL8w5KpGBbLFPQ+dXOJURgZ3OMbZmwxlKQrGMuA= +github.com/stackitcloud/stackit-sdk-go/services/mariadb v1.0.0 h1:G/OqKHAgmH/GgqagGaow1aV6jkmVdTCexCM425PbXaE= +github.com/stackitcloud/stackit-sdk-go/services/mariadb v1.0.0/go.mod h1:joa89Y1dyn0j22FstRcIKfW2ada3FDxNfttxSvq27uY= +github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.11.0 h1:LfcQ++Z8a13jrJ5NOaCY/hwToh/e+QJj0eS6rd6s6k8= +github.com/stackitcloud/stackit-sdk-go/services/modelserving v0.11.0/go.mod h1:u7T85YqoqncJevbPU1ODKthbmxxEh1zw+bVaAO8v0Sg= +github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.11.0 h1:mjcTktPsrqN/XvtuYs0O23n1lbbYkY5lvSxrNtzfaPs= +github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.11.0/go.mod h1:0hHEPiOEMAA23EzEl42Rm3FlyKIzkW+LWLvDkuFTZ+Q= github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.9.0 h1:T+ll3lS0Kn18d8hTOrVAMKcQrXiab+Cuj0cTnAYHmj0= github.com/stackitcloud/stackit-sdk-go/services/objectstorage v1.9.0/go.mod h1:QsPtoqAYvumyPU6ToX/5j1PbudN+VSTuvh6mp154ecM= -github.com/stackitcloud/stackit-sdk-go/services/observability v0.23.0 h1:kgD32fG3rkdGz0C+kZ1S7BEur7btTSeaX3vxHE346FY= -github.com/stackitcloud/stackit-sdk-go/services/observability v0.23.0/go.mod h1:0fEZQHm729mBdvg4sNrAhM6KmHROHJSeS2FwCMRk46k= +github.com/stackitcloud/stackit-sdk-go/services/observability v0.24.0 h1:KhuWPXr1hl8BFLGLSi6wjxh5o6OQXH9amfquMhYQROU= +github.com/stackitcloud/stackit-sdk-go/services/observability v0.24.0/go.mod h1:0fEZQHm729mBdvg4sNrAhM6KmHROHJSeS2FwCMRk46k= github.com/stackitcloud/stackit-sdk-go/services/opensearch v1.0.0 h1:xJ/rhcMTV2pZ+s9PX/Q7+f4amNqn+kBl0t62cJ6xfko= github.com/stackitcloud/stackit-sdk-go/services/opensearch v1.0.0/go.mod h1:L+NlfC1hilLOqlLLukCj/UDnxlnNrc/oMikcw3Ansyw= -github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.9.0 h1:a6BN3e8/dDgBiUSUGbvX1z+X/kgAWa6+3Yt2fnV7ro0= -github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.9.0/go.mod h1:yzlakB+f8ur4yAHR6lyCABO+HcEtZG3G2Faj6m5/uW8= -github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.30.0 h1:zAFgiybClUjSaSKkGRfxKRiPmuJI7j5bnb+41/Zhtm8= -github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.30.0/go.mod h1:TwfVVynB/+AKbccSOLk2qZpPL1tdK43BBAiACP6EtSg= -github.com/stackitcloud/stackit-sdk-go/services/redis v0.28.2 h1:9s8yUxXEORj/ChLLf5vGdjmMC3PhDlYRIVd4v23Uavg= -github.com/stackitcloud/stackit-sdk-go/services/redis v0.28.2/go.mod h1:yjej6QfYoYdRIyKXlmbVz8fZYxbuUdl+QBkvLDPgA4k= -github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.23.0 h1:u2C3oHNcc41Ba5cUqSPuqviDrYSRhpaC5+ELbuHHdwM= -github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.23.0/go.mod h1:NEz3f+GV5G++BE9/MmZCsXJyCih7jtg0pZuSyG2sLEs= +github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.10.0 h1:Ia8FWqG14hkl7rWAUDjSKwd+8NPvrPGOpUC0jLB1sR0= +github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.10.0/go.mod h1:yzlakB+f8ur4yAHR6lyCABO+HcEtZG3G2Faj6m5/uW8= +github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v1.0.0 h1:kHdXzMcYPLRwidoQuNu1U12PmqCBNqpTS+U82rB9HtY= +github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v1.0.0/go.mod h1:TwfVVynB/+AKbccSOLk2qZpPL1tdK43BBAiACP6EtSg= +github.com/stackitcloud/stackit-sdk-go/services/redis v1.0.0 h1:JsHchCTVpCVUB0KQyjzlFEwJEdorql6pBpXtqQDjtqU= +github.com/stackitcloud/stackit-sdk-go/services/redis v1.0.0/go.mod h1:yjej6QfYoYdRIyKXlmbVz8fZYxbuUdl+QBkvLDPgA4k= +github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0 h1:JPP6a0ME1tZXr4iB69d/LtJsCAr58ENBadFaK9f48/c= +github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.24.0/go.mod h1:NEz3f+GV5G++BE9/MmZCsXJyCih7jtg0pZuSyG2sLEs= github.com/stackitcloud/stackit-sdk-go/services/scf v0.9.0 h1:pwcGFeU2b6DLOGQGNbbw91zN0qIlBan4d7DGtGGZEEY= github.com/stackitcloud/stackit-sdk-go/services/scf v0.9.0/go.mod h1:w3rXz3Klz5XxpI7eXpvZTYlu8LQkZJiFxKg6DNBgenQ= github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.18.1 h1:U5rstX5e6Am2t+Ukv5K1Sbftzxt5aFALMa9YS4jCJoo= github.com/stackitcloud/stackit-sdk-go/services/secretsmanager v0.18.1/go.mod h1:2XA8PE05Qg6BL2YXO4XgfGI9qskJ3cicLE5Qq0aqDdY= -github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.2 h1:NCGehrXvtpFaeH85fU1DWisf3+IgqoGUERY70UfwTUU= -github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.6.2/go.mod h1:BJeafbecuocdirGCAJ2Vz/rPSK/LRrB5lPBEacqd1eU= +github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.7.0 h1:U3bm+RVHD1USpB6Fk9WNfPQxK0x0DY7ubusmRSh/A/8= +github.com/stackitcloud/stackit-sdk-go/services/serverbackup v1.7.0/go.mod h1:BJeafbecuocdirGCAJ2Vz/rPSK/LRrB5lPBEacqd1eU= github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2 h1:6C/iTPoYPCrZOc3JMmvyDNs4hm+JR5p9O3DIfFGgnbo= github.com/stackitcloud/stackit-sdk-go/services/serverupdate v1.5.2/go.mod h1:/OHYZXQb9KXDdZK5J9C2YS6DJUD2i6ednZ1rK7zpDZ0= -github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.19.0 h1:VDGfv4VUKo+yogizhjKLzcNa5CR28q6uWDLQs5ntgO0= -github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.19.0/go.mod h1:xJNa86o89czK2o60+s46vz8+NSKDTbQduFGFaztJnsA= -github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.6.0 h1:4ufJ4Iti/6ImdUfHVUToDgwBeDJZdr4Pqff60YAHsag= -github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.6.0/go.mod h1:fXq3TmVLb4JMSve989NFFViMFoYa83s7M3hJWgN6mdQ= -github.com/stackitcloud/stackit-sdk-go/services/sfs v0.10.1 h1:t1kx4zz/6eHpJGOnWnX0+KsS3KLlPDFo2gE11pZkdqg= -github.com/stackitcloud/stackit-sdk-go/services/sfs v0.10.1/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI= +github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.20.0 h1:4/xfpcqHLkKkaVS/HOOIWa3n7Z/O0DysPc+/+FVSltE= +github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.20.0/go.mod h1:xJNa86o89czK2o60+s46vz8+NSKDTbQduFGFaztJnsA= +github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0 h1:TNZHrunhsXRbuqZcucLs2Gqy1sEyvabufM7pB5Tscmo= +github.com/stackitcloud/stackit-sdk-go/services/serviceenablement v1.7.0/go.mod h1:fXq3TmVLb4JMSve989NFFViMFoYa83s7M3hJWgN6mdQ= +github.com/stackitcloud/stackit-sdk-go/services/sfs v0.11.0 h1:YhQ2GF+AyHVUps1iEjLj7z6OlzBzMGyD5nwHaZ0pXus= +github.com/stackitcloud/stackit-sdk-go/services/sfs v0.11.0/go.mod h1:jMlBoXqrPNX5nXbo6oT7exalqilw1jiLPoIp4Cn0CdI= github.com/stackitcloud/stackit-sdk-go/services/ske v1.18.0 h1:6Umom7V12bVa7D3dnMJAKj/GWg7wqR9FpqmZ8TjsO1Q= github.com/stackitcloud/stackit-sdk-go/services/ske v1.18.0/go.mod h1:TbqmZhLMofmfl+HhVl6oHYcI3zvXTm1vRjN3A/fOkM4= -github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0 h1:PwjQeupEnXxhu+uWCUzO/hUfL4yqNblOcZbP2jvaQtU= -github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.11.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M= +github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.13.0 h1:w7l3Z7lkDKnJ+3rudGjZ8GMKxGmpIS5dT6pO9MMNWqQ= +github.com/stackitcloud/stackit-sdk-go/services/sqlserverflex v1.13.0/go.mod h1:AiUoMAqQcOlMgDtkVJlqI7P/VGD5xjN3dYjERGnwN/M= github.com/stackitcloud/stackit-sdk-go/services/telemetrylink v0.2.0 h1:U1mQoCk0TXc8NsSc/Sl9PKMdEyJpWNU2zLnsqmx6wEc= github.com/stackitcloud/stackit-sdk-go/services/telemetrylink v0.2.0/go.mod h1:hgw8janWmDfP2bnuZensxqcAePr49BX5ug8Rq85o+h8= github.com/stackitcloud/stackit-sdk-go/services/telemetryrouter v0.3.0 h1:MEvzGItcbig+9A4JvK2E5W6/mqXDPafiGkDZ1BprBAI= diff --git a/stackit/internal/services/cdn/distribution/datasource_test.go b/stackit/internal/services/cdn/distribution/datasource_test.go index 7c0effccb..6db4b7fea 100644 --- a/stackit/internal/services/cdn/distribution/datasource_test.go +++ b/stackit/internal/services/cdn/distribution/datasource_test.go @@ -202,7 +202,7 @@ func TestMapDataSourceFields(t *testing.T) { }, Id: "test-distribution-id", ProjectId: "test-project-id", - Status: string(cdnSdk.DOMAINSTATUS_ACTIVE), + Status: cdnSdk.DISTRIBUTIONSTATUS_ACTIVE, UpdatedAt: updatedAt, } for _, mod := range mods { @@ -299,7 +299,7 @@ func TestMapDataSourceFields(t *testing.T) { m.Status = types.StringValue("ERROR") }), Input: distributionFixture(func(d *cdnSdk.Distribution) { - d.Status = string(cdnSdk.DOMAINSTATUS_ERROR) + d.Status = cdnSdk.DISTRIBUTIONSTATUS_ERROR }), IsValid: true, }, diff --git a/stackit/internal/services/cdn/distribution/resource.go b/stackit/internal/services/cdn/distribution/resource.go index 488acdfed..651de966c 100644 --- a/stackit/internal/services/cdn/distribution/resource.go +++ b/stackit/internal/services/cdn/distribution/resource.go @@ -1157,7 +1157,7 @@ func mapFields(ctx context.Context, distribution *cdnSdk.Distribution, model *Mo tfStatusCode := types.Int32Null() if r.StatusCode > 0 { - tfStatusCode = types.Int32Value(r.StatusCode) + tfStatusCode = types.Int32Value(int32(r.StatusCode)) } tfRuleMatchCond := types.StringValue("ANY") @@ -1517,7 +1517,7 @@ func convertRedirectconfig(redirectConfigModel *redirectConfig) *cdnSdk.Redirect Enabled: rule.Enabled, Matchers: matchers, RuleMatchCondition: ruleMatchCond, - StatusCode: rule.StatusCode, + StatusCode: cdnSdk.RedirectRuleStatusCode(rule.StatusCode), TargetUrl: targetUrl, } sdkRules = append(sdkRules, sdkConfigRule) @@ -1601,7 +1601,7 @@ func convertConfig(ctx context.Context, model *Model) (*cdnSdk.Config, error) { Enabled: rule.Enabled, Matchers: matchers, RuleMatchCondition: ruleMatchCond, - StatusCode: rule.StatusCode, + StatusCode: cdnSdk.RedirectRuleStatusCode(rule.StatusCode), TargetUrl: rule.TargetUrl, } sdkRules = append(sdkRules, sdkConfigRule) diff --git a/stackit/internal/services/dns/recordset/datasource.go b/stackit/internal/services/dns/recordset/datasource.go index 04995fa8c..c967bef3d 100644 --- a/stackit/internal/services/dns/recordset/datasource.go +++ b/stackit/internal/services/dns/recordset/datasource.go @@ -6,7 +6,6 @@ import ( "net/http" "github.com/hashicorp/terraform-plugin-framework-timeouts/datasource/timeouts" - "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api/wait" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" dnsUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/dns/utils" @@ -181,7 +180,7 @@ func (d *recordSetDataSource) Read(ctx context.Context, req datasource.ReadReque ctx = core.LogResponse(ctx) - if recordSetResp != nil && recordSetResp.Rrset.State == wait.RECORDSETSTATE_DELETE_SUCCEEDED { + if recordSetResp != nil && recordSetResp.Rrset.State == dns.RECORDSETSTATE_DELETE_SUCCEEDED { resp.State.RemoveResource(ctx) core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading record set", "Record set was deleted successfully") return diff --git a/stackit/internal/services/dns/recordset/resource.go b/stackit/internal/services/dns/recordset/resource.go index ae8a3bbb2..6ed634ca3 100644 --- a/stackit/internal/services/dns/recordset/resource.go +++ b/stackit/internal/services/dns/recordset/resource.go @@ -314,7 +314,7 @@ func (r *recordSetResource) Read(ctx context.Context, req resource.ReadRequest, core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading record set", fmt.Sprintf("Calling API: %v", err)) return } - if recordSetResp != nil && recordSetResp.Rrset.State == wait.RECORDSETSTATE_DELETE_SUCCEEDED { + if recordSetResp != nil && recordSetResp.Rrset.State == dns.RECORDSETSTATE_DELETE_SUCCEEDED { resp.State.RemoveResource(ctx) return } @@ -520,9 +520,9 @@ func mapFields(ctx context.Context, recordSetResp *dns.RecordSetResponse, model model.Name = types.StringValue(recordSet.Name) } model.FQDN = types.StringValue(recordSet.Name) - model.State = types.StringValue(recordSet.State) + model.State = types.StringValue(string(recordSet.State)) model.TTL = types.Int32Value(recordSet.Ttl) - model.Type = types.StringValue(recordSet.Type) + model.Type = types.StringValue(string(recordSet.Type)) return nil } @@ -547,7 +547,7 @@ func toCreatePayload(model *Model) (*dns.CreateRecordSetPayload, error) { Name: model.Name.ValueString(), Records: records, Ttl: conversion.Int32ValueToPointer(model.TTL), - Type: model.Type.ValueString(), + Type: dns.CreateRecordSetPayloadType(model.Type.ValueString()), }, nil } diff --git a/stackit/internal/services/dns/recordset/resource_test.go b/stackit/internal/services/dns/recordset/resource_test.go index 372a20e4a..cd0df1d15 100644 --- a/stackit/internal/services/dns/recordset/resource_test.go +++ b/stackit/internal/services/dns/recordset/resource_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api" - "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api/wait" ) func TestMapFields(t *testing.T) { @@ -67,7 +66,7 @@ func TestMapFields(t *testing.T) { {Content: "record_1"}, {Content: "record_2"}, }, - State: wait.RECORDSETSTATE_CREATING, + State: dns.RECORDSETSTATE_CREATING, Ttl: 1, Type: "A", }, @@ -86,7 +85,7 @@ func TestMapFields(t *testing.T) { types.StringValue("record_1"), types.StringValue("record_2"), }), - State: types.StringValue(wait.RECORDSETSTATE_CREATING), + State: types.StringValue(string(dns.RECORDSETSTATE_CREATING)), TTL: types.Int32Value(1), Type: types.StringValue("A"), }, @@ -113,7 +112,7 @@ func TestMapFields(t *testing.T) { {Content: "record_1"}, {Content: "record_2"}, }, - State: wait.RECORDSETSTATE_CREATING, + State: dns.RECORDSETSTATE_CREATING, Ttl: 1, Type: "A", }, @@ -132,7 +131,7 @@ func TestMapFields(t *testing.T) { types.StringValue("record_2"), types.StringValue("record_1"), }), - State: types.StringValue(wait.RECORDSETSTATE_CREATING), + State: types.StringValue(string(dns.RECORDSETSTATE_CREATING)), TTL: types.Int32Value(1), Type: types.StringValue("A"), }, @@ -153,7 +152,7 @@ func TestMapFields(t *testing.T) { Error: nil, Name: "name", Records: nil, - State: wait.RECORDSETSTATE_CREATING, + State: dns.RECORDSETSTATE_CREATING, Ttl: 2123456789, Type: "A", }, @@ -169,7 +168,7 @@ func TestMapFields(t *testing.T) { Name: types.StringValue("other-name"), FQDN: types.StringValue("name"), Records: types.ListNull(types.StringType), - State: types.StringValue(wait.RECORDSETSTATE_CREATING), + State: types.StringValue(string(dns.RECORDSETSTATE_CREATING)), TTL: types.Int32Value(2123456789), Type: types.StringValue("A"), }, diff --git a/stackit/internal/services/dns/zone/datasource.go b/stackit/internal/services/dns/zone/datasource.go index 4f5153472..7e58a7ec7 100644 --- a/stackit/internal/services/dns/zone/datasource.go +++ b/stackit/internal/services/dns/zone/datasource.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework-validators/datasourcevalidator" "github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator" "github.com/hashicorp/terraform-plugin-framework/path" - "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api/wait" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" dnsUtils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/dns/utils" @@ -275,7 +274,7 @@ func (d *zoneDataSource) Read(ctx context.Context, req datasource.ReadRequest, r zoneResp = dns.NewZoneResponse(zones[0]) } - if zoneResp != nil && zoneResp.Zone.State == wait.ZONESTATE_DELETE_SUCCEEDED { + if zoneResp != nil && zoneResp.Zone.State == dns.ZONESTATE_DELETE_SUCCEEDED { resp.State.RemoveResource(ctx) core.LogAndAddError(ctx, &resp.Diagnostics, "Error reading zone", "Zone was deleted successfully") return diff --git a/stackit/internal/services/dns/zone/resource.go b/stackit/internal/services/dns/zone/resource.go index b01ebe8e1..d0e00d0b6 100644 --- a/stackit/internal/services/dns/zone/resource.go +++ b/stackit/internal/services/dns/zone/resource.go @@ -405,7 +405,7 @@ func (r *zoneResource) Read(ctx context.Context, req resource.ReadRequest, resp ctx = core.LogResponse(ctx) - if zoneResp != nil && zoneResp.Zone.State == wait.ZONESTATE_DELETE_SUCCEEDED { + if zoneResp != nil && zoneResp.Zone.State == dns.ZONESTATE_DELETE_SUCCEEDED { resp.State.RemoveResource(ctx) return } @@ -617,9 +617,9 @@ func mapFields(ctx context.Context, zoneResp *dns.ZoneResponse, model *Model) er model.RefreshTime = types.Int32Value(z.RefreshTime) model.RetryTime = types.Int32Value(z.RetryTime) model.SerialNumber = types.Int32Value(z.SerialNumber) - model.State = types.StringValue(z.State) - model.Type = types.StringValue(z.Type) - model.Visibility = types.StringValue(z.Visibility) + model.State = types.StringValue(string(z.State)) + model.Type = types.StringValue(string(z.Type)) + model.Visibility = types.StringValue(string(z.Visibility)) return nil } @@ -642,7 +642,7 @@ func toCreatePayload(model *Model) (*dns.CreateZonePayload, error) { ContactEmail: conversion.StringValueToPointer(model.ContactEmail), Description: conversion.StringValueToPointer(model.Description), Acl: conversion.StringValueToPointer(model.Acl), - Type: conversion.StringValueToPointer(model.Type), + Type: conversion.StringValueToEnumPointer[dns.CreateZonePayloadType](model.Type), DefaultTTL: conversion.Int32ValueToPointer(model.DefaultTTL), ExpireTime: conversion.Int32ValueToPointer(model.ExpireTime), RefreshTime: conversion.Int32ValueToPointer(model.RefreshTime), diff --git a/stackit/internal/services/dns/zone/resource_test.go b/stackit/internal/services/dns/zone/resource_test.go index 81799bb06..2f2bde114 100644 --- a/stackit/internal/services/dns/zone/resource_test.go +++ b/stackit/internal/services/dns/zone/resource_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-framework/attr" "github.com/hashicorp/terraform-plugin-framework/types" dns "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api" - "github.com/stackitcloud/stackit-sdk-go/services/dns/v1api/wait" ) func TestMapFields(t *testing.T) { @@ -84,7 +83,7 @@ func TestMapFields(t *testing.T) { RetryTime: 4, SerialNumber: 5, NegativeCache: 6, - State: wait.ZONESTATE_CREATING, + State: dns.ZONESTATE_CREATING, Type: "primary", Primaries: []string{"primary"}, PrimaryNameServer: "pns", @@ -113,7 +112,7 @@ func TestMapFields(t *testing.T) { SerialNumber: types.Int32Value(5), NegativeCache: types.Int32Value(6), Type: types.StringValue("primary"), - State: types.StringValue(wait.ZONESTATE_CREATING), + State: types.StringValue(string(dns.ZONESTATE_CREATING)), PrimaryNameServer: types.StringValue("pns"), Primaries: types.ListValueMust(types.StringType, []attr.Value{ types.StringValue("primary"), @@ -219,7 +218,7 @@ func TestMapFields(t *testing.T) { RetryTime: int32(4), SerialNumber: int32(5), NegativeCache: int32(0), - State: wait.ZONESTATE_CREATING, + State: dns.ZONESTATE_CREATING, Type: "primary", Primaries: nil, PrimaryNameServer: "pns", @@ -248,7 +247,7 @@ func TestMapFields(t *testing.T) { NegativeCache: types.Int32Value(0), Type: types.StringValue("primary"), Primaries: types.ListNull(types.StringType), - State: types.StringValue(wait.ZONESTATE_CREATING), + State: types.StringValue(string(dns.ZONESTATE_CREATING)), PrimaryNameServer: types.StringValue("pns"), Visibility: types.StringValue("public"), ContactEmail: types.StringNull(), @@ -339,7 +338,7 @@ func TestToCreatePayload(t *testing.T) { DnsName: "DnsName", Acl: new("Acl"), Description: new("Description"), - Type: new("primary"), + Type: new(dns.CREATEZONEPAYLOADTYPE_PRIMARY), ContactEmail: new("ContactEmail"), Primaries: []string{"primary"}, RetryTime: new(int32(3)), diff --git a/stackit/internal/services/edgecloud/instance/resource.go b/stackit/internal/services/edgecloud/instance/resource.go index 00c55137d..eda8ba19c 100644 --- a/stackit/internal/services/edgecloud/instance/resource.go +++ b/stackit/internal/services/edgecloud/instance/resource.go @@ -479,7 +479,7 @@ func mapFields(resp *edge.Instance, model *Model) error { model.FrontendUrl = types.StringValue(resp.FrontendUrl) model.DisplayName = types.StringValue(resp.DisplayName) model.PlanID = types.StringValue(resp.PlanId) - model.Status = types.StringValue(resp.Status) + model.Status = types.StringValue(string(resp.Status)) if resp.Description != nil { model.Description = types.StringValue(*resp.Description) diff --git a/stackit/internal/services/edgecloud/instances/datasource.go b/stackit/internal/services/edgecloud/instances/datasource.go index fec05e12d..28596add5 100644 --- a/stackit/internal/services/edgecloud/instances/datasource.go +++ b/stackit/internal/services/edgecloud/instances/datasource.go @@ -241,7 +241,7 @@ func mapInstanceToAttrs(instance *edge.Instance, region string) map[string]attr. "region": types.StringValue(region), "plan_id": types.StringValue(instance.PlanId), "frontend_url": types.StringValue(instance.FrontendUrl), - "status": types.StringValue(instance.Status), + "status": types.StringValue(string(instance.Status)), "created": types.StringValue(instance.Created.String()), "description": types.StringPointerValue(instance.Description), } diff --git a/stackit/internal/services/edgecloud/instances/datasource_test.go b/stackit/internal/services/edgecloud/instances/datasource_test.go index 5e3425bd5..73734b468 100644 --- a/stackit/internal/services/edgecloud/instances/datasource_test.go +++ b/stackit/internal/services/edgecloud/instances/datasource_test.go @@ -64,7 +64,7 @@ func TestMapInstanceToAttrs(t *testing.T) { "region": types.StringValue(region), "plan_id": types.StringValue(validInstance.PlanId), "frontend_url": types.StringValue(validInstance.FrontendUrl), - "status": types.StringValue(validInstance.Status), + "status": types.StringValue(string(validInstance.Status)), "created": types.StringValue(testTime.String()), "description": types.StringPointerValue(validInstance.Description), } diff --git a/stackit/internal/services/git/instance/resource.go b/stackit/internal/services/git/instance/resource.go index da6dc5450..ba71a8ba8 100644 --- a/stackit/internal/services/git/instance/resource.go +++ b/stackit/internal/services/git/instance/resource.go @@ -430,7 +430,7 @@ func toCreatePayload(ctx context.Context, model *Model) (git.CreateInstancePaylo } if !(model.Flavor.IsNull() || model.Flavor.IsUnknown()) { - payload.Flavor = model.Flavor.ValueStringPointer() + payload.Flavor = conversion.StringValueToEnumPointer[git.CreateInstancePayloadFlavor](model.Flavor) } return payload, diags diff --git a/stackit/internal/services/git/instance/resource_test.go b/stackit/internal/services/git/instance/resource_test.go index af0789d6e..6e9d8b528 100644 --- a/stackit/internal/services/git/instance/resource_test.go +++ b/stackit/internal/services/git/instance/resource_test.go @@ -163,7 +163,7 @@ func TestToCreatePayload(t *testing.T) { }, expected: git.CreateInstancePayload{ Name: "my-instance", - Flavor: new("git-100"), + Flavor: new(git.CREATEINSTANCEPAYLOADFLAVOR_GIT_100), Acl: []string{"10.0.0.1", "10.0.0.2"}, }, expectError: false, @@ -177,7 +177,7 @@ func TestToCreatePayload(t *testing.T) { }, expected: git.CreateInstancePayload{ Name: "my-instance", - Flavor: new("git-100"), + Flavor: new(git.CREATEINSTANCEPAYLOADFLAVOR_GIT_100), Acl: []string{}, }, expectError: false, diff --git a/stackit/internal/services/intake/runner/resource.go b/stackit/internal/services/intake/runner/resource.go index f99bafbe5..53738c288 100644 --- a/stackit/internal/services/intake/runner/resource.go +++ b/stackit/internal/services/intake/runner/resource.go @@ -252,7 +252,7 @@ func (r *runnerResource) Create(ctx context.Context, req resource.CreateRequest, } // Wait for creation of intake runner - _, err = wait.CreateOrUpdateIntakeRunnerWaitHandler(ctx, r.client.DefaultAPI, projectId, region, runnerResp.GetId()).WaitWithContext(ctx) + _, err = wait.CreateIntakeWaitHandler(ctx, r.client.DefaultAPI, projectId, region, runnerResp.GetId()).WaitWithContext(ctx) if err != nil { core.LogAndAddError(ctx, &resp.Diagnostics, "Error creating runner", fmt.Sprintf("Intake runner creation waiting: %v", err)) return @@ -351,7 +351,7 @@ func (r *runnerResource) Update(ctx context.Context, req resource.UpdateRequest, ctx = core.LogResponse(ctx) // Wait for update - _, err = wait.CreateOrUpdateIntakeRunnerWaitHandler(ctx, r.client.DefaultAPI, projectId, region, runnerId).WaitWithContext(ctx) + _, err = wait.UpdateIntakeWaitHandler(ctx, r.client.DefaultAPI, projectId, region, runnerId).WaitWithContext(ctx) if err != nil { core.LogAndAddError(ctx, &resp.Diagnostics, "Error updating runner", fmt.Sprintf("Runner update waiting: %v", err)) return diff --git a/stackit/internal/services/logme/instance/resource.go b/stackit/internal/services/logme/instance/resource.go index 8d5c4cf38..292a7b930 100644 --- a/stackit/internal/services/logme/instance/resource.go +++ b/stackit/internal/services/logme/instance/resource.go @@ -894,7 +894,7 @@ func toInstanceParams(parameters *parametersModel) (*logmeSdk.InstanceParameters payloadParams.MonitoringInstanceId = conversion.StringValueToPointer(parameters.MonitoringInstanceId) var err error - payloadParams.OpensearchTlsCiphers, err = conversion.StringListToSlice(parameters.OpensearchTlsCiphers) + payloadParams.OpensearchTlsCiphers, err = conversion.StringListToEnumSlice[logmeSdk.InstanceParametersOpensearchTlsCiphersInner](parameters.OpensearchTlsCiphers) if err != nil { return nil, fmt.Errorf("convert opensearch_tls_ciphers: %w", err) } diff --git a/stackit/internal/services/logme/instance/resource_test.go b/stackit/internal/services/logme/instance/resource_test.go index 770011fc3..42ec63eb0 100644 --- a/stackit/internal/services/logme/instance/resource_test.go +++ b/stackit/internal/services/logme/instance/resource_test.go @@ -90,7 +90,7 @@ var fixtureInstanceParameters = logmeSdk.InstanceParameters{ MetricsFrequency: new(int32(10)), MetricsPrefix: new("prefix"), MonitoringInstanceId: new("mid"), - OpensearchTlsCiphers: []string{"ciphers", "ciphers2"}, + OpensearchTlsCiphers: []logmeSdk.InstanceParametersOpensearchTlsCiphersInner{"ciphers", "ciphers2"}, OpensearchTlsProtocols: []string{"protocols", "protocols2"}, Syslog: []string{"syslog", "syslog2"}, } diff --git a/stackit/internal/services/logme/logme_acc_test.go b/stackit/internal/services/logme/logme_acc_test.go index b5d3c965c..98ecf9140 100644 --- a/stackit/internal/services/logme/logme_acc_test.go +++ b/stackit/internal/services/logme/logme_acc_test.go @@ -465,11 +465,11 @@ func testAccCheckLogMeDestroy(s *terraform.State) error { } func checkInstanceDeleteSuccess(i *logmeSdk.Instance) bool { - if i.LastOperation.Type != wait.INSTANCESTATUS_DELETING { + if i.LastOperation.Type != logmeSdk.INSTANCELASTOPERATIONTYPE_DELETE { return false } - if i.LastOperation.Type == wait.INSTANCESTATUS_DELETING { + if i.LastOperation.Type == logmeSdk.INSTANCELASTOPERATIONTYPE_DELETE { if strings.Contains(i.LastOperation.Description, "DeleteFailed") || strings.Contains(i.LastOperation.Description, "failed") { return false } diff --git a/stackit/internal/services/logs/accesstoken/datasource.go b/stackit/internal/services/logs/accesstoken/datasource.go index 97d5ce6eb..f39f5602b 100644 --- a/stackit/internal/services/logs/accesstoken/datasource.go +++ b/stackit/internal/services/logs/accesstoken/datasource.go @@ -217,7 +217,7 @@ func mapDataSourceFields(ctx context.Context, accessToken *logs.AccessToken, mod model.Description = types.StringPointerValue(accessToken.Description) model.DisplayName = types.StringValue(accessToken.DisplayName) model.Expires = types.BoolValue(accessToken.Expires) - model.Status = types.StringValue(accessToken.Status) + model.Status = types.StringValue(string(accessToken.Status)) model.ValidUntil = types.StringNull() if accessToken.ValidUntil != nil { diff --git a/stackit/internal/services/logs/accesstoken/datasource_test.go b/stackit/internal/services/logs/accesstoken/datasource_test.go index 5338174d2..c236c529c 100644 --- a/stackit/internal/services/logs/accesstoken/datasource_test.go +++ b/stackit/internal/services/logs/accesstoken/datasource_test.go @@ -53,7 +53,7 @@ func TestMapDataSourceFields(t *testing.T) { { description: "max values", input: fixtureAccessToken(func(accessToken *logs.AccessToken) { - accessToken.Permissions = []string{"write"} + accessToken.Permissions = []logs.PermissionsInner{logs.PERMISSIONSINNER_WRITE} accessToken.AccessToken = new("") accessToken.Description = new("description") accessToken.DisplayName = "display-name" diff --git a/stackit/internal/services/logs/accesstoken/resource.go b/stackit/internal/services/logs/accesstoken/resource.go index 977bc25f7..c7223ef59 100644 --- a/stackit/internal/services/logs/accesstoken/resource.go +++ b/stackit/internal/services/logs/accesstoken/resource.go @@ -24,9 +24,10 @@ import ( "github.com/stackitcloud/stackit-sdk-go/core/oapierror" logs "github.com/stackitcloud/stackit-sdk-go/services/logs/v1api" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/logs/utils" + "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/conversion" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/core" - "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/services/logs/utils" tfutils "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/utils" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/validate" ) @@ -480,7 +481,9 @@ func toCreatePayload(ctx context.Context, diagnostics diag.Diagnostics, model *M permissionDiags := model.Permissions.ElementsAs(ctx, &permissions, false) diagnostics.Append(permissionDiags...) if !permissionDiags.HasError() { - payload.Permissions = permissions + payload.Permissions = tfutils.Map(permissions, func(t string) logs.PermissionsInner { + return logs.PermissionsInner(t) + }) } } @@ -511,7 +514,7 @@ func mapFields(ctx context.Context, accessToken *logs.AccessToken, model *Model) model.Description = types.StringPointerValue(accessToken.Description) model.DisplayName = types.StringValue(accessToken.DisplayName) model.Expires = types.BoolValue(accessToken.Expires) - model.Status = types.StringValue(accessToken.Status) + model.Status = types.StringValue(string(accessToken.Status)) model.ValidUntil = types.StringNull() if accessToken.ValidUntil != nil { diff --git a/stackit/internal/services/logs/accesstoken/resource_test.go b/stackit/internal/services/logs/accesstoken/resource_test.go index 686f75c3c..e896ba4ec 100644 --- a/stackit/internal/services/logs/accesstoken/resource_test.go +++ b/stackit/internal/services/logs/accesstoken/resource_test.go @@ -70,7 +70,7 @@ func TestMapFields(t *testing.T) { { description: "max values", input: fixtureAccessToken(func(accessToken *logs.AccessToken) { - accessToken.Permissions = []string{"write"} + accessToken.Permissions = []logs.PermissionsInner{logs.PERMISSIONSINNER_WRITE} accessToken.AccessToken = new("") accessToken.Description = new("description") accessToken.DisplayName = "display-name" @@ -151,7 +151,7 @@ func TestToCreatePayload(t *testing.T) { model.Lifetime = types.Int32Value(7) }), expected: &logs.CreateAccessTokenPayload{ - Permissions: []string{"read", "write"}, + Permissions: []logs.PermissionsInner{logs.PERMISSIONSINNER_READ, logs.PERMISSIONSINNER_WRITE}, Description: new("description"), DisplayName: "display-name", Lifetime: new(int32(7)), diff --git a/stackit/internal/services/logs/instance/resource.go b/stackit/internal/services/logs/instance/resource.go index 9f46320bf..32d1fc6ba 100644 --- a/stackit/internal/services/logs/instance/resource.go +++ b/stackit/internal/services/logs/instance/resource.go @@ -496,7 +496,7 @@ func mapFields(ctx context.Context, instance *logs.LogsInstance, model *Model) e model.QueryRangeURL = types.StringPointerValue(instance.QueryRangeUrl) model.QueryURL = types.StringPointerValue(instance.QueryUrl) model.RetentionDays = types.Int32Value(instance.RetentionDays) - model.Status = types.StringValue(instance.Status) + model.Status = types.StringValue(string(instance.Status)) return nil } diff --git a/stackit/internal/services/modelserving/token/resource.go b/stackit/internal/services/modelserving/token/resource.go index b0d30a2a6..f3e5a753f 100644 --- a/stackit/internal/services/modelserving/token/resource.go +++ b/stackit/internal/services/modelserving/token/resource.go @@ -576,7 +576,7 @@ func mapCreateResponse(tokenCreateResp *modelserving.CreateTokenResponse, waitRe model.Id = utils.BuildInternalTerraformId(model.ProjectId.ValueString(), region, tokenCreateResp.Token.Id) model.TokenId = types.StringValue(token.Id) model.Name = types.StringValue(token.Name) - model.State = types.StringValue(waitResp.Token.State) + model.State = types.StringValue(string(waitResp.Token.State)) model.ValidUntil = validUntil model.Token = types.StringValue(token.Content) model.Description = types.StringPointerValue(token.Description) @@ -596,7 +596,7 @@ func mapGetResponse(tokenGetResp *modelserving.GetTokenResponse, model *Model) e model.Id = utils.BuildInternalTerraformId(model.ProjectId.ValueString(), model.Region.ValueString(), model.TokenId.ValueString()) model.TokenId = types.StringValue(tokenGetResp.Token.Id) model.Name = types.StringValue(tokenGetResp.Token.Name) - model.State = types.StringValue(tokenGetResp.Token.State) + model.State = types.StringValue(string(tokenGetResp.Token.State)) model.ValidUntil = types.StringValue(tokenGetResp.Token.ValidUntil.Format(time.RFC3339)) model.Description = types.StringPointerValue(tokenGetResp.Token.Description) diff --git a/stackit/internal/services/rabbitmq/instance/resource.go b/stackit/internal/services/rabbitmq/instance/resource.go index 458f699a9..2654423ab 100644 --- a/stackit/internal/services/rabbitmq/instance/resource.go +++ b/stackit/internal/services/rabbitmq/instance/resource.go @@ -776,7 +776,7 @@ func toInstanceParams(parameters *parametersModel) (*rabbitmq.InstanceParameters payloadParams.MonitoringInstanceId = conversion.StringValueToPointer(parameters.MonitoringInstanceId) var err error - payloadParams.Plugins, err = conversion.StringListToSlice(parameters.Plugins) + payloadParams.Plugins, err = conversion.StringListToEnumSlice[rabbitmq.InstanceParametersPluginsInner](parameters.Plugins) if err != nil { return nil, fmt.Errorf("converting plugins: %w", err) } @@ -796,7 +796,7 @@ func toInstanceParams(parameters *parametersModel) (*rabbitmq.InstanceParameters return nil, fmt.Errorf("converting tls_ciphers: %w", err) } - payloadParams.TlsProtocols, err = conversion.StringListToSlice(parameters.TlsProtocols) + payloadParams.TlsProtocols, err = conversion.StringListToEnumSlice[rabbitmq.InstanceParametersTlsProtocolsInner](parameters.TlsProtocols) if err != nil { return nil, fmt.Errorf("converting tls_protocol_versions: %w", err) } diff --git a/stackit/internal/services/rabbitmq/instance/resource_test.go b/stackit/internal/services/rabbitmq/instance/resource_test.go index 8c7a41b3d..6242ad249 100644 --- a/stackit/internal/services/rabbitmq/instance/resource_test.go +++ b/stackit/internal/services/rabbitmq/instance/resource_test.go @@ -51,11 +51,11 @@ var fixtureInstanceParameters = rabbitmq.InstanceParameters{ MetricsFrequency: new(int32(10)), MetricsPrefix: new("prefix"), MonitoringInstanceId: new("mid"), - Plugins: []string{"plugin1", "plugin2"}, + Plugins: []rabbitmq.InstanceParametersPluginsInner{"plugin1", "plugin2"}, Roles: []string{"role1", "role2"}, Syslog: []string{"syslog", "syslog2"}, TlsCiphers: []string{"ciphers1", "ciphers2"}, - TlsProtocols: []string{"tlsv1.2", "tlsv1.3"}, + TlsProtocols: []rabbitmq.InstanceParametersTlsProtocolsInner{"tlsv1.2", "tlsv1.3"}, } func TestMapFields(t *testing.T) { diff --git a/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go b/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go index 9ea05b736..089736beb 100644 --- a/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go +++ b/stackit/internal/services/rabbitmq/rabbitmq_acc_test.go @@ -288,11 +288,11 @@ func testAccCheckRabbitMQDestroy(s *terraform.State) error { } func checkInstanceDeleteSuccess(i *rabbitmq.Instance) bool { - if i.LastOperation.Type != wait.INSTANCELASTOPERATIONTYPE_DELETE { + if i.LastOperation.Type != rabbitmq.INSTANCELASTOPERATIONTYPE_DELETE { return false } - if i.LastOperation.Type == wait.INSTANCELASTOPERATIONTYPE_DELETE { + if i.LastOperation.Type == rabbitmq.INSTANCELASTOPERATIONTYPE_DELETE { if i.LastOperation.State != "succeeded" { return false } else if strings.Contains(i.LastOperation.Description, "DeleteFailed") || strings.Contains(i.LastOperation.Description, "failed") { diff --git a/stackit/internal/services/redis/instance/resource.go b/stackit/internal/services/redis/instance/resource.go index 710ea9c27..6b0a4d281 100644 --- a/stackit/internal/services/redis/instance/resource.go +++ b/stackit/internal/services/redis/instance/resource.go @@ -851,12 +851,12 @@ func toInstanceParams(parameters *parametersModel) (*redis.InstanceParameters, e payloadParams.EnableMonitoring = conversion.BoolValueToPointer(parameters.EnableMonitoring) payloadParams.FailoverTimeout = conversion.Int32ValueToPointer(parameters.FailoverTimeout) payloadParams.Graphite = conversion.StringValueToPointer(parameters.Graphite) - payloadParams.LazyfreeLazyEviction = conversion.StringValueToPointer(parameters.LazyfreeLazyEviction) - payloadParams.LazyfreeLazyExpire = conversion.StringValueToPointer(parameters.LazyfreeLazyExpire) + payloadParams.LazyfreeLazyEviction = conversion.StringValueToEnumPointer[redis.InstanceParametersLazyfreeLazyEviction](parameters.LazyfreeLazyEviction) + payloadParams.LazyfreeLazyExpire = conversion.StringValueToEnumPointer[redis.InstanceParametersLazyfreeLazyExpire](parameters.LazyfreeLazyExpire) payloadParams.LuaTimeLimit = conversion.Int32ValueToPointer(parameters.LuaTimeLimit) payloadParams.MaxDiskThreshold = conversion.Int32ValueToPointer(parameters.MaxDiskThreshold) payloadParams.Maxclients = conversion.Int32ValueToPointer(parameters.Maxclients) - payloadParams.MaxmemoryPolicy = conversion.StringValueToPointer(parameters.MaxmemoryPolicy) + payloadParams.MaxmemoryPolicy = conversion.StringValueToEnumPointer[redis.InstanceParametersMaxmemoryPolicy](parameters.MaxmemoryPolicy) payloadParams.MaxmemorySamples = conversion.Int32ValueToPointer(parameters.MaxmemorySamples) payloadParams.MetricsFrequency = conversion.Int32ValueToPointer(parameters.MetricsFrequency) payloadParams.MetricsPrefix = conversion.StringValueToPointer(parameters.MetricsPrefix) @@ -865,7 +865,7 @@ func toInstanceParams(parameters *parametersModel) (*redis.InstanceParameters, e payloadParams.NotifyKeyspaceEvents = conversion.StringValueToPointer(parameters.NotifyKeyspaceEvents) payloadParams.Snapshot = conversion.StringValueToPointer(parameters.Snapshot) payloadParams.TlsCiphersuites = conversion.StringValueToPointer(parameters.TlsCiphersuites) - payloadParams.TlsProtocols = conversion.StringValueToPointer(parameters.TlsProtocols) + payloadParams.TlsProtocols = conversion.StringValueToEnumPointer[redis.InstanceParametersTlsProtocols](parameters.TlsProtocols) var err error payloadParams.Syslog, err = conversion.StringListToSlice(parameters.Syslog) diff --git a/stackit/internal/services/redis/instance/resource_test.go b/stackit/internal/services/redis/instance/resource_test.go index ffcddb9f6..eb6338762 100644 --- a/stackit/internal/services/redis/instance/resource_test.go +++ b/stackit/internal/services/redis/instance/resource_test.go @@ -48,12 +48,12 @@ var fixtureInstanceParameters = redis.InstanceParameters{ EnableMonitoring: new(true), FailoverTimeout: new(int32(10)), Graphite: new("1.1.1.1:91"), - LazyfreeLazyEviction: new("no"), - LazyfreeLazyExpire: new("no"), + LazyfreeLazyEviction: new(redis.INSTANCEPARAMETERSLAZYFREELAZYEVICTION_NO), + LazyfreeLazyExpire: new(redis.INSTANCEPARAMETERSLAZYFREELAZYEXPIRE_NO), LuaTimeLimit: new(int32(10)), MaxDiskThreshold: new(int32(100)), Maxclients: new(int32(10)), - MaxmemoryPolicy: new("volatile-lru"), + MaxmemoryPolicy: new(redis.INSTANCEPARAMETERSMAXMEMORYPOLICY_VOLATILE_LRU), MaxmemorySamples: new(int32(10)), MetricsFrequency: new(int32(10)), MetricsPrefix: new("prefix"), @@ -64,7 +64,7 @@ var fixtureInstanceParameters = redis.InstanceParameters{ Syslog: []string{"syslog", "syslog2"}, TlsCiphers: []string{"ciphers1", "ciphers2"}, TlsCiphersuites: new("ciphersuites"), - TlsProtocols: new("TLSv1.2"), + TlsProtocols: new(redis.INSTANCEPARAMETERSTLSPROTOCOLS_TLSV1_2), } func TestMapFields(t *testing.T) { diff --git a/stackit/internal/services/redis/redis_acc_test.go b/stackit/internal/services/redis/redis_acc_test.go index 3814f176f..1c55e2569 100644 --- a/stackit/internal/services/redis/redis_acc_test.go +++ b/stackit/internal/services/redis/redis_acc_test.go @@ -258,11 +258,11 @@ func TestAccRedisResource(t *testing.T) { } func checkInstanceDeleteSuccess(i *redis.Instance) bool { - if i.LastOperation.Type != wait.INSTANCELASTOPERATIONTYPE_DELETE { + if i.LastOperation.Type != redis.INSTANCELASTOPERATIONTYPE_DELETE { return false } - if i.LastOperation.Type == wait.INSTANCELASTOPERATIONTYPE_DELETE { + if i.LastOperation.Type == redis.INSTANCELASTOPERATIONTYPE_DELETE { if i.LastOperation.State != "succeeded" { return false } else if strings.Contains(i.LastOperation.Description, "DeleteFailed") || strings.Contains(i.LastOperation.Description, "failed") { diff --git a/stackit/internal/services/ske/ske_test.go b/stackit/internal/services/ske/ske_test.go index 493de9382..721d31b44 100644 --- a/stackit/internal/services/ske/ske_test.go +++ b/stackit/internal/services/ske/ske_test.go @@ -12,7 +12,6 @@ import ( "github.com/hashicorp/terraform-plugin-testing/plancheck" serviceenablement "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api" - serviceenablementWait "github.com/stackitcloud/stackit-sdk-go/services/serviceenablement/v2api/wait" ske "github.com/stackitcloud/stackit-sdk-go/services/ske/v2api" "github.com/stackitcloud/terraform-provider-stackit/stackit/internal/testutil" @@ -62,14 +61,14 @@ resource "stackit_ske_cluster" "cluster" { testutil.MockResponse{ Description: "service enablement request", ToJsonBody: serviceenablement.ServiceStatus{ - State: new(serviceenablementWait.SERVICESTATUSSTATE_ENABLED), + State: new(serviceenablement.SERVICESTATUSSTATE_ENABLED), }, StatusCode: http.StatusOK, }, testutil.MockResponse{ Description: "service enablement wait handler", ToJsonBody: serviceenablement.ServiceStatus{ - State: new(serviceenablementWait.SERVICESTATUSSTATE_ENABLED), + State: new(serviceenablement.SERVICESTATUSSTATE_ENABLED), Error: nil, }, StatusCode: http.StatusOK, @@ -257,14 +256,14 @@ resource "stackit_ske_cluster" "cluster" { testutil.MockResponse{ Description: "service enablement request", ToJsonBody: serviceenablement.ServiceStatus{ - State: new(serviceenablementWait.SERVICESTATUSSTATE_ENABLED), + State: new(serviceenablement.SERVICESTATUSSTATE_ENABLED), }, StatusCode: http.StatusOK, }, testutil.MockResponse{ Description: "service enablement wait handler", ToJsonBody: serviceenablement.ServiceStatus{ - State: new(serviceenablementWait.SERVICESTATUSSTATE_ENABLED), + State: new(serviceenablement.SERVICESTATUSSTATE_ENABLED), Error: nil, }, StatusCode: http.StatusOK,