Fix integration and acceptance tests

outscale · Aug 1, 2024 · ea4aedd · ea4aedd
1 parent 4b32312
commit ea4aedd
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 122 deletions.
diff --git a/outscale/data_source_outscale_api_access_rules_test.go b/outscale/data_source_outscale_api_access_rules_test.go
@@ -3,6 +3,7 @@ package outscale
 import (
 	"context"
 	"fmt"
+	"os"
 	"testing"
 	"time"
 
@@ -15,13 +16,14 @@ import (
 func TestAccDataOutscaleApiAccessRules_basic(t *testing.T) {
 	t.Parallel()
 	resourceName := "outscale_api_access_rule.rule_data"
+	ca_path := os.Getenv("CA_PATH")
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
 		Providers:    testAccProviders,
 		CheckDestroy: testAccDataCheckOutscaleApiAccessRuleDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccDataOutscaleApiAccessRulesConfig(),
+				Config: testAccDataOutscaleApiAccessRulesConfig(ca_path),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckOutscaleApiAccessRuleExists(resourceName),
 				),
@@ -68,10 +70,10 @@ func testAccDataCheckOutscaleApiAccessRulesDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAccDataOutscaleApiAccessRulesConfig() string {
+func testAccDataOutscaleApiAccessRulesConfig(cert_path string) string {
 	return fmt.Sprintf(`
 resource "outscale_ca" "ca_rule" { 
-   ca_pem       = file("./test-cert.pem")
+   ca_pem       = file("%q")
    description  = "Ca testacc create"
 }
 
@@ -99,5 +101,5 @@ data "outscale_api_access_rules" "filters_rules" {
 }
 
 data "outscale_api_access_rules" "all_rules" {}
-	`)
+	`, cert_path)
 }
diff --git a/...i_access_rule_datasource_attributes_ok/step1.api_access_rule_datasource_attributes_ok.ref b/...i_access_rule_datasource_attributes_ok/step1.api_access_rule_datasource_attributes_ok.ref
@@ -161,8 +161,8 @@
                     "attributes": {
                         "api_access_rule_id": "##id-0##",
                         "ca_ids": [
-                            "##id-2##",
-                            "##id-1##"
+                            "##id-1##",
+                            "##id-2##"
                         ],
                         "cns": [
                             "outscale-1",
@@ -193,10 +193,10 @@
                     "schema_version": 0,
                     "attributes": {
                         "ca_fingerprint": "########",
-                        "ca_id": "##id-2##",
+                        "ca_id": "##id-1##",
                         "ca_pem": "########",
                         "description": "",
-                        "id": "##id-2##",
+                        "id": "##id-1##",
                         "request_id": "########"
                     },
                     "sensitive_attributes": [],
@@ -214,10 +214,10 @@
                     "schema_version": 0,
                     "attributes": {
                         "ca_fingerprint": "########",
-                        "ca_id": "##id-1##",
+                        "ca_id": "##id-2##",
                         "ca_pem": "########",
                         "description": "",
-                        "id": "##id-1##",
+                        "id": "##id-2##",
                         "request_id": "########"
                     },
                     "sensitive_attributes": [],

diff --git a/...1_api_access_rule_resource_attributes_ok/step1.api_access_rule_resource_attributes_ok.ref b/...1_api_access_rule_resource_attributes_ok/step1.api_access_rule_resource_attributes_ok.ref
@@ -47,10 +47,10 @@
                     "schema_version": 0,
                     "attributes": {
                         "ca_fingerprint": "########",
-                        "ca_id": "##id-1##",
+                        "ca_id": "##id-2##",
                         "ca_pem": "########",
                         "description": "",
-                        "id": "##id-1##",
+                        "id": "##id-2##",
                         "request_id": "########"
                     },
                     "sensitive_attributes": [],
@@ -68,10 +68,10 @@
                     "schema_version": 0,
                     "attributes": {
                         "ca_fingerprint": "########",
-                        "ca_id": "##id-2##",
+                        "ca_id": "##id-1##",
                         "ca_pem": "########",
                         "description": "",
-                        "id": "##id-2##",
+                        "id": "##id-1##",
                         "request_id": "########"
                     },
                     "sensitive_attributes": [],

diff --git a/..._oapi/data/cas/TF-199_cas_datasource_attributes_ok/step1.cas_datasource_attributes_ok.ref b/..._oapi/data/cas/TF-199_cas_datasource_attributes_ok/step1.cas_datasource_attributes_ok.ref
@@ -18,12 +18,12 @@
                             {
                                 "ca_fingerprint": "########",
                                 "ca_id": "##id-0##",
-                                "description": "test-TF199"
+                                "description": "test-TF199-2"
                             },
                             {
                                 "ca_fingerprint": "########",
                                 "ca_id": "##id-1##",
-                                "description": "test-TF199-2"
+                                "description": "test-TF199"
                             }
                         ],
                         "filter": "########",
@@ -47,12 +47,12 @@
                             {
                                 "ca_fingerprint": "########",
                                 "ca_id": "##id-0##",
-                                "description": "test-TF199"
+                                "description": "test-TF199-2"
                             },
                             {
                                 "ca_fingerprint": "########",
                                 "ca_id": "##id-1##",
-                                "description": "test-TF199-2"
+                                "description": "test-TF199"
                             }
                         ],
                         "filter": "########",
@@ -73,10 +73,10 @@
                     "schema_version": 0,
                     "attributes": {
                         "ca_fingerprint": "########",
-                        "ca_id": "##id-0##",
+                        "ca_id": "##id-1##",
                         "ca_pem": "########",
                         "description": "test-TF199",
-                        "id": "##id-0##",
+                        "id": "##id-1##",
                         "request_id": "########"
                     },
                     "sensitive_attributes": [],
@@ -94,10 +94,10 @@
                     "schema_version": 0,
                     "attributes": {
                         "ca_fingerprint": "########",
-                        "ca_id": "##id-1##",
+                        "ca_id": "##id-0##",
                         "ca_pem": "########",
                         "description": "test-TF199-2",
-                        "id": "##id-1##",
+                        "id": "##id-0##",
                         "request_id": "########"
                     },
                     "sensitive_attributes": [],

diff --git a/tests/qa_provider_oapi/data/cert_example/certificate.key b/tests/qa_provider_oapi/data/cert_example/certificate.key
diff --git a/tests/qa_provider_oapi/data/cert_example/certificate.pem b/tests/qa_provider_oapi/data/cert_example/certificate.pem
diff --git a/...alancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.ref b/...alancer_resource_attributes_ok/step4.public_load_balancer_resource_update_listener_ok.ref
@@ -84,7 +84,7 @@
                 {
                     "schema_version": 0,
                     "attributes": {
-                        "body": "-----BEGIN CERTIFICATE-----\nMIIFCzCCAvOgAwIBAgIUepeU5aKBGJMY5XyUXqKWpuMqTmUwDQYJKoZIhvcNAQEL\nBQAwFTETMBEGA1UEAwwKZG9tYWluLmNvbTAeFw0yMzA2MjcwOTEwNDlaFw0yNDA2\nMjEwOTEwNDlaMBUxEzARBgNVBAMMCmRvbWFpbi5jb20wggIiMA0GCSqGSIb3DQEB\nAQUAA4ICDwAwggIKAoICAQDSFoa9qYsaGASCJOL33Q8m6hB2l7uBeDllijcCB9sR\nCO5A+nGvba2syBeSFWcXWrSGN1FX5pAPYzE0/avDcjZUHQ9L68wP6e3hKAZyisII\nFY0cw357PoUr26jXCmzbd2unSlStva0vxMsOLJfRK4DjB/ZtDBWlIvR52LhFfjwq\ntKTIZJepkF18IVRGaamwnikT7UkQi8fEqrkcWG9QK5RxXViegXdFbSPl1kqhtiRT\nHUZM1JBSEVoK3vp0uHGvyeN0UvNe+GUDvgXqjvxfSTvA3RlgTWWQu5UrtKlOadZM\nOJFlGaA6r8tOLZ/QlauhsFGBoA6ArldoM8gbfdwcELhdpqG1APuh6oXOvd9OeNwN\nHazK7RWd2JS+DoXRUApJ34cZhXbkbotShKPrWk16BkwhjxsOtVC0cQXFokN4Ryyi\n9LF7MJCGp8veG4eJWvd5C2wM1gTkWoMefcNwsAT0vCtjCFXDsWZKz9PFO4s447As\nQMprqw9uvA8BHFWTvz+ZjazSPOTXPIzDUD+jFOLwXzpaU7fDcN398XmVGSfoQfv6\n4ql0MFnQhZFol9ArMUnPJONJrtXZI8Ph55Lh3+gf/ZCFER7ubXDCHwtoIdPqp9Fq\nKSoDPB762s2pWQCl5OLVU39Vy8l7OvJ8LwkvLSdtRp5mg5Fdu0ZtjdJQwSbRU6aJ\nwwIDAQABo1MwUTAdBgNVHQ4EFgQU1yrj9jvN2di7NJyyEYkHGAirT98wHwYDVR0j\nBBgwFoAU1yrj9jvN2di7NJyyEYkHGAirT98wDwYDVR0TAQH/BAUwAwEB/zANBgkq\nhkiG9w0BAQsFAAOCAgEAJoGwCHZlnS/kBhU6pymzsw/t1MbJGEZIfCoAjQ0KtOB2\nArCejR1BEXHbNOt3d7Ei7kCzUveEgwkqPHwV9ryrEKvXspWCZ1T0e+21OFhaPv8B\nlDQ6n7uMW8vWETX9WO8NbjIJTgUKAea9PtOzJTO+W9HbrgjM7gOM9/NvopzrjKVU\nlTcZLAvx4gLhKdlAnhxMdI//+oPyuEciq7ejUNIAlGJaauMmTh1tqIzjnBk32762\negP+W6M5mgIONgiUwDJsIYx7D7GHu3i1XvKRo0+C32cGgNvwFCUQg60Si/paIJMo\nMk0SrgRk5i/kPKfkkTMi26VmGnfeWT2jkESzX0ozBPkzlqQVON/8enHMl6V94wIE\ngq8im6IjJcKvfNoyAXN+ftdD9Uk1D3llUaycGH+adMj4Bb3UqdyMCC3YFeVNgae5\nVadGFDcKA4J/RgCL0rGsZ1jMvt5nWH2mWyGYrHnvkWLHsCIW9EuZDksfUfQSBa8M\n+DOwmDXyUZrYaAfHlgreNfgJrz4C5uFodORDQvu0SM89ex03TccZ2lh3eympkOvv\nO2H6SkF7uq3Sy8wmUjdRL00jqhvqPWVbbpXOMEkuBAlCYpMXEFjbOFCNKSOV5vJ/\n2ckco2bu15h8klyc6w9E18vX/vY1ofp07wNGVPhAVyaxZPjPMGp6gkmnbyY7yIU=\n-----END CERTIFICATE-----\n",
+                        "body": "-----BEGIN CERTIFICATE-----\nMIIFCzCCAvOgAwIBAgIUNwhIOK2NxMDHpNDxxkNN68HyyvswDQYJKoZIhvcNAQEL\nBQAwFTETMBEGA1UEAwwKZG9tYWluLmNvbTAeFw0yNDA4MDExNTEwNDZaFw0yNDA4\nMDMxNTEwNDZaMBUxEzARBgNVBAMMCmRvbWFpbi5jb20wggIiMA0GCSqGSIb3DQEB\nAQUAA4ICDwAwggIKAoICAQDfywIH2oE9aTOfCtlJ3nOYnfrXOo2yJ3bUAozlqwRT\nsb9KI/CreVIcgyKRhh37q84U+T9KNZofNo/DAjB2iseNYi6C7wDFTkT0+QTXI8GT\n4Jb1dx/OHVsT3KYA3oS4ZwkJb+YjNQTMuKcgUKP5An4rY+3ssdjTIbO3MKo383k3\ncCNNFYAnjGBmTGG3pIH4P2vEVNSNNu9jecPiJY5ced0EGgNwNNqrOwCHwYNi2jl8\n6f9k87cSoWAJtSiDqWmsYEfyICat5wGlOufJNA9Wt5OuAGydS7FX149CFPwpETkS\nkX2fTuWNYAyPhApBwQIq2kKmaU7Jw1bgtWDUF12cc133kGe24oQ+XCN9SeOP3YwN\nSlEqVgqiL8XiapR5M3abTJdX0wF+E0n6ucSw2wRkW7/6gSMDpd/0nCWb/LQk/bld\n8eBePi+NIZw06Fzg0BMvix2SoHSnUxFdvJyZT61inU6kB2JnjWw2WNECLvrZ/VsP\n2v2wq3PQETqWjK7q2lvIDmJaQIeJT/vJrDW8XBPsrthqnN6nKLgFjec+lokAYjMX\ndfc1pHQMWQQlnZXDOLBVPLbxS93MwtHH9r/gZfnKy4P/i9qKzXSN59ixqaiR6Bg5\nAd9lo4jNyrinnLeudTispz4wSJbofrvmN+y8urXRO/PAgSgAW4+g7jsRZRpZeBXB\nIwIDAQABo1MwUTAdBgNVHQ4EFgQUS1j7X6TRwVN1BwiWB66h+guihGYwHwYDVR0j\nBBgwFoAUS1j7X6TRwVN1BwiWB66h+guihGYwDwYDVR0TAQH/BAUwAwEB/zANBgkq\nhkiG9w0BAQsFAAOCAgEAONQifvo1VFNshbH8SZNEH8lH4NXvfhUD1hgpf0f9HdEZ\nR79laXexp1BpKvpaIkTIk4gp8DCBmAHuE1Vqy9jHGAxqSqAZncWjknVPfwLE0Mx6\nIqqwTKTFJIIhqJBxBqkUW46zA3/vHqhVD291HtYCP828bpudeaJnuhkOVWBHD0PA\nBml7MxoZGmGqhrqkv1pSd54NR0wrLvln275LMb1a/Wer/1OEpMbaJAaPvuw9R0ou\nr7FMRaFu87S/tMYGpRd79NPOiOqNUTFRJ9AzBhZL2rQl6hJKBjqlVAd/WS+nVTVS\nkqVUA4GRMot3rVFi5fPJK+by3AbvvI+8CUply+eEm8Y49IdssTY4+ocbkSzJS44/\nPjm4NCQd9p6+Cmrs2+2+WF1LjzHc2qf4kF00PHpRELNJThxH8tbO3zkMCzqSJE5+\njESi8nfinz9bMVo4cNokq4i3EC5lKijYJspaSXtfPssZe69LzTjkiyO8TuS8Z3EG\n/aDC04fDjiCXaqLRjYa1oZNboFsB57qGpyqlJ2YA0Yep2UBwXmL5IhSImCIH2S9j\nsH+ta5x9jCE/7l48kwC0XEOz1m/x8nqaizydN79H3gNXBk09JkCd3lE3CgWIueqw\nY1nD8v5jW6olGOp1p7LY+uf7C6pmpZwDDyL7sUvxpvEYC5U8wFxiu8Z6StGB5sA=\n-----END CERTIFICATE-----\n",
                         "chain": null,
                         "dry_run": null,
                         "expiration_date": "",