From 6980fcecf69be9b01758037bd7f2a430e2641e8b Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Wed, 15 Jan 2025 10:29:46 -0800 Subject: [PATCH 1/3] Remove RSA and PGP keys from tests Now import them from env vars --- ...e_artifactory_federated_repository_test.go | 230 +++-------------- ...ource_artifactory_local_repository_test.go | 241 +++--------------- .../datasource/repository/local/local.go | 3 - ...rce_artifactory_virtual_repository_test.go | 75 +----- ...actory_release_bundle_v2_promotion_test.go | 81 +----- ...urce_artifactory_release_bundle_v2_test.go | 200 ++------------- ...e_artifactory_federated_repository_test.go | 228 +++-------------- ...rtifactory_local_alpine_repository_test.go | 106 ++------ ...tifactory_local_ansible_repository_test.go | 93 ++----- ...rtifactory_local_debian_repository_test.go | 149 ++--------- ...e_artifactory_local_rpm_repository_test.go | 149 ++--------- ...rce_artifactory_virtual_repository_test.go | 75 +----- .../resource_artifactory_keypair_test.go | 134 ++-------- .../resource_artifactory_scoped_token_test.go | 14 +- ...ce_artifactory_vault_configuration_test.go | 2 +- 15 files changed, 258 insertions(+), 1522 deletions(-) delete mode 100644 pkg/artifactory/datasource/repository/local/local.go diff --git a/pkg/artifactory/datasource/repository/federated/datasource_artifactory_federated_repository_test.go b/pkg/artifactory/datasource/repository/federated/datasource_artifactory_federated_repository_test.go index 0683e5448..cf9c8bac0 100644 --- a/pkg/artifactory/datasource/repository/federated/datasource_artifactory_federated_repository_test.go +++ b/pkg/artifactory/datasource/repository/federated/datasource_artifactory_federated_repository_test.go @@ -28,7 +28,7 @@ func skipFederatedRepo() (bool, string) { func federatedTestCase(repoType string, t *testing.T) (*testing.T, resource.TestCase) { if skip, reason := skipFederatedRepo(); skip { - t.Skipf(reason) + t.Skip(reason) } name := fmt.Sprintf("federated-%s-%d", repoType, rand.Int()) @@ -107,44 +107,10 @@ func TestAccDataSourceFederatedAlpineRepository(t *testing.T) { pair_type = "RSA" alias = "foo-alias{{ .kp_id }}" private_key = < Date: Wed, 15 Jan 2025 10:37:27 -0800 Subject: [PATCH 2/3] Add env vars for secrets to test Actions --- .github/workflows/acceptance-tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index dcee1b67c..3c9cd32fa 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -115,6 +115,11 @@ jobs: echo "JFROG_ACCESS_TOKEN=$JFROG_ACCESS_TOKEN" >> "$GITHUB_ENV" - name: Execute acceptance tests run: make acceptance + env: + JFROG_TEST_PGP_PRIVATE_KEY: ${{ secrets.JFROG_TEST_PGP_PRIVATE_KEY }} + JFROG_TEST_PGP_PUBLIC_KEY: ${{ secrets.JFROG_TEST_PGP_PUBLIC_KEY }} + JFROG_TEST_RSA_PRIVATE_KEY: ${{ secrets.JFROG_TEST_RSA_PRIVATE_KEY }} + JFROG_TEST_RSA_PUBLIC_KEY: ${{ secrets.JFROG_TEST_RSA_PUBLIC_KEY }} - name: Install provider run: | export PROVIDER_VERSION=$(git describe --tags --abbrev=0 | sed -n 's/v\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1.\2.\3/p') From 796f467bd39f8442811fe373219b6e546b8d6a33 Mon Sep 17 00:00:00 2001 From: Alex Hung Date: Wed, 15 Jan 2025 11:18:37 -0800 Subject: [PATCH 3/3] Fix KeyPair tests --- .../resource_artifactory_keypair_test.go | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkg/artifactory/resource/security/resource_artifactory_keypair_test.go b/pkg/artifactory/resource/security/resource_artifactory_keypair_test.go index 1bc2595a3..660a52bff 100644 --- a/pkg/artifactory/resource/security/resource_artifactory_keypair_test.go +++ b/pkg/artifactory/resource/security/resource_artifactory_keypair_test.go @@ -61,8 +61,8 @@ EOF Config: keyPairConfig, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(fqrn, "pair_name", name), - resource.TestCheckResourceAttr(fqrn, "public_key", "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ymVc24BoaZb0ElXoI3X\n4zUKJGZEetR6F4yT1tJhkPDg7UTmiNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbq\nFUaXPgud8VabfHl0imXvN746zmpjYEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEpp\nj5yN0tVWDnqjOJjR7EpxMSdP3TSd6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof\n+FwcLGvs+mmyBq8Jz5Zy4BSCk1fQFmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDM\nX8KGs7e9ZgjANkT5PnipLOaeLJU4H+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJ\nDQIDAQAB\n-----END PUBLIC KEY-----\n"), - resource.TestCheckResourceAttr(fqrn, "private_key", "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA2ymVc24BoaZb0ElXoI3X4zUKJGZEetR6F4yT1tJhkPDg7UTm\niNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbqFUaXPgud8VabfHl0imXvN746zmpj\nYEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEppj5yN0tVWDnqjOJjR7EpxMSdP3TSd\n6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof+FwcLGvs+mmyBq8Jz5Zy4BSCk1fQ\nFmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDMX8KGs7e9ZgjANkT5PnipLOaeLJU4\nH+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJDQIDAQABAoIBAFb7wyhEIfuhhlE9\nuryrb2LrGzJlMIq7qBWOouKhLz4SjIM/VGw+c76VkjZGoSU+LeLj+D0W1ie0u2Cw\ngJM8aW22TbK/c5lksWOO5PVFDdPG+ZoRWY3MLGlhlL5E4UhMPgJyy/eeiRjZ3CZM\npja+UfVAwn1KVNR8UinVZYPt680AvEd1FGxoNLxemIPNug46nNqp6Al86Bn+BnkN\nGXpwyooXVSfo4k+pnFBFIXUdA1dUEXQSVb1AxlTo6g/Ok/+8Gfq8idCdu+5fcZI2\n1eLeC+FAa92rr1SFX/UWeB4cMyuAqwuxbFFIplT22SaUSsNuOUSH4E00nbP/AuCb\n1BqrLmECgYEA7tQKfyF9aiXTsOMdOnSAa5OyEaCfsFtcmLd4ykVrwN8O36NoX005\nVbGuqo87fwIXQIKHU+kOEs/TmaQ8bNcbCD/SfWGTtOnHG4qfIsepJuoMwbQHRhGF\nJeoXh5yEUKg5pcDBY8PENEtEVKmFuL4bPOdn+9FNLGsjftvXpmGWbGUCgYEA6uuQ\n7kzO6WD88OsxdJzlJM11hg2SaSBCh3+5tnOhF1ULOUt4tdYXzh3QI6BPX7tkArYf\nXteVfWoWqn6T7LtCjFm350BqVpPhqfLKnt6fYf1yotsj/cyZXlXquRbxbgakB0n0\n4PrsZaube0TPPVeirzNyOVHyFc+iW+F+IUYD+4kCgYEApDEjBkP/9PoMj4+UiJuP\nrmXcBkJnhtdI0bVRVb5kVjUEBLxTBTISONfvPVM7lBXb5n3Wi9mt00EOOJKw+CLq\ncsFt9MUgxz/xov2qaj7aC+bc3k7msUVaRLardpAkZ09AUrQyQGRWf50/XPUu+dO4\n5iYxVu6OH/uIa664k6qDwAECgYEAslS8oomgEL3VhbWkx1dLA5MMggTPfgpFNsMY\n4Y4JXcLrUEUgjzjEvW0YUdMiLhP8qapDSiXxj1D3f9myxWSp8g0xc9UMZEjCZ9at\nRcjNyP8zBLnCKqokSt6B3puyDsnvvrC/ugIBbnTFBOCJSZG7J7CwJx8z3KbQI1ub\n+fpCj7ECgYAd69soLEybUGMjsdI+OijIGoUTUoZGXJm+0VpBt4QJCe7AMnYPfYzA\nJnEmN4D7HLTKUBklQnb/FhP/RuiT2bSAd1l+PNeuU7gYROCBBonzxXQ1wEbNrSYA\niyoc9g/kvV8HTW8361xEhu7wmuSEEx1gQ/7sdhTkgrTncc8hxVRxuA==\n-----END RSA PRIVATE KEY-----\n"), + resource.TestCheckResourceAttr(fqrn, "public_key", fmt.Sprintf("%s\n", os.Getenv("JFROG_TEST_RSA_PUBLIC_KEY"))), + resource.TestCheckResourceAttr(fqrn, "private_key", fmt.Sprintf("%s\n", os.Getenv("JFROG_TEST_RSA_PRIVATE_KEY"))), resource.TestCheckResourceAttr(fqrn, "alias", fmt.Sprintf("test-alias-%d", id)), resource.TestCheckResourceAttr(fqrn, "pair_type", "RSA"), resource.TestCheckResourceAttr(fqrn, "passphrase", "password"), @@ -169,9 +169,11 @@ EOF fqrn, template, map[string]string{ - "id": fmt.Sprint(id), - "name": name, - "passphrase": "new-password", + "id": fmt.Sprint(id), + "name": name, + "passphrase": "new-password", + "private_key": os.Getenv("JFROG_TEST_RSA_PRIVATE_KEY"), + "public_key": os.Getenv("JFROG_TEST_RSA_PUBLIC_KEY"), }, ) @@ -184,8 +186,8 @@ EOF Config: keyBasic, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(fqrn, "pair_name", name), - resource.TestCheckResourceAttr(fqrn, "public_key", "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ymVc24BoaZb0ElXoI3X\n4zUKJGZEetR6F4yT1tJhkPDg7UTmiNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbq\nFUaXPgud8VabfHl0imXvN746zmpjYEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEpp\nj5yN0tVWDnqjOJjR7EpxMSdP3TSd6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof\n+FwcLGvs+mmyBq8Jz5Zy4BSCk1fQFmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDM\nX8KGs7e9ZgjANkT5PnipLOaeLJU4H+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJ\nDQIDAQAB\n-----END PUBLIC KEY-----\n"), - resource.TestCheckResourceAttr(fqrn, "private_key", "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA2ymVc24BoaZb0ElXoI3X4zUKJGZEetR6F4yT1tJhkPDg7UTm\niNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbqFUaXPgud8VabfHl0imXvN746zmpj\nYEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEppj5yN0tVWDnqjOJjR7EpxMSdP3TSd\n6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof+FwcLGvs+mmyBq8Jz5Zy4BSCk1fQ\nFmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDMX8KGs7e9ZgjANkT5PnipLOaeLJU4\nH+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJDQIDAQABAoIBAFb7wyhEIfuhhlE9\nuryrb2LrGzJlMIq7qBWOouKhLz4SjIM/VGw+c76VkjZGoSU+LeLj+D0W1ie0u2Cw\ngJM8aW22TbK/c5lksWOO5PVFDdPG+ZoRWY3MLGlhlL5E4UhMPgJyy/eeiRjZ3CZM\npja+UfVAwn1KVNR8UinVZYPt680AvEd1FGxoNLxemIPNug46nNqp6Al86Bn+BnkN\nGXpwyooXVSfo4k+pnFBFIXUdA1dUEXQSVb1AxlTo6g/Ok/+8Gfq8idCdu+5fcZI2\n1eLeC+FAa92rr1SFX/UWeB4cMyuAqwuxbFFIplT22SaUSsNuOUSH4E00nbP/AuCb\n1BqrLmECgYEA7tQKfyF9aiXTsOMdOnSAa5OyEaCfsFtcmLd4ykVrwN8O36NoX005\nVbGuqo87fwIXQIKHU+kOEs/TmaQ8bNcbCD/SfWGTtOnHG4qfIsepJuoMwbQHRhGF\nJeoXh5yEUKg5pcDBY8PENEtEVKmFuL4bPOdn+9FNLGsjftvXpmGWbGUCgYEA6uuQ\n7kzO6WD88OsxdJzlJM11hg2SaSBCh3+5tnOhF1ULOUt4tdYXzh3QI6BPX7tkArYf\nXteVfWoWqn6T7LtCjFm350BqVpPhqfLKnt6fYf1yotsj/cyZXlXquRbxbgakB0n0\n4PrsZaube0TPPVeirzNyOVHyFc+iW+F+IUYD+4kCgYEApDEjBkP/9PoMj4+UiJuP\nrmXcBkJnhtdI0bVRVb5kVjUEBLxTBTISONfvPVM7lBXb5n3Wi9mt00EOOJKw+CLq\ncsFt9MUgxz/xov2qaj7aC+bc3k7msUVaRLardpAkZ09AUrQyQGRWf50/XPUu+dO4\n5iYxVu6OH/uIa664k6qDwAECgYEAslS8oomgEL3VhbWkx1dLA5MMggTPfgpFNsMY\n4Y4JXcLrUEUgjzjEvW0YUdMiLhP8qapDSiXxj1D3f9myxWSp8g0xc9UMZEjCZ9at\nRcjNyP8zBLnCKqokSt6B3puyDsnvvrC/ugIBbnTFBOCJSZG7J7CwJx8z3KbQI1ub\n+fpCj7ECgYAd69soLEybUGMjsdI+OijIGoUTUoZGXJm+0VpBt4QJCe7AMnYPfYzA\nJnEmN4D7HLTKUBklQnb/FhP/RuiT2bSAd1l+PNeuU7gYROCBBonzxXQ1wEbNrSYA\niyoc9g/kvV8HTW8361xEhu7wmuSEEx1gQ/7sdhTkgrTncc8hxVRxuA==\n-----END RSA PRIVATE KEY-----\n"), + resource.TestCheckResourceAttr(fqrn, "public_key", fmt.Sprintf("%s\n", os.Getenv("JFROG_TEST_RSA_PUBLIC_KEY"))), + resource.TestCheckResourceAttr(fqrn, "private_key", fmt.Sprintf("%s\n", os.Getenv("JFROG_TEST_RSA_PRIVATE_KEY"))), resource.TestCheckResourceAttr(fqrn, "alias", fmt.Sprintf("test-alias-%d", id)), resource.TestCheckResourceAttr(fqrn, "pair_type", "RSA"), resource.TestCheckResourceAttr(fqrn, "passphrase", "password"), @@ -195,8 +197,8 @@ EOF Config: keyUpdatedPassphrase, Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(fqrn, "pair_name", name), - resource.TestCheckResourceAttr(fqrn, "public_key", "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ymVc24BoaZb0ElXoI3X\n4zUKJGZEetR6F4yT1tJhkPDg7UTmiNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbq\nFUaXPgud8VabfHl0imXvN746zmpjYEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEpp\nj5yN0tVWDnqjOJjR7EpxMSdP3TSd6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof\n+FwcLGvs+mmyBq8Jz5Zy4BSCk1fQFmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDM\nX8KGs7e9ZgjANkT5PnipLOaeLJU4H+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJ\nDQIDAQAB\n-----END PUBLIC KEY-----\n"), - resource.TestCheckResourceAttr(fqrn, "private_key", "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA2ymVc24BoaZb0ElXoI3X4zUKJGZEetR6F4yT1tJhkPDg7UTm\niNoFB5TZJvP6LBrrSwszkpZbxaVOkBrwrGbqFUaXPgud8VabfHl0imXvN746zmpj\nYEMGqJzm+Gh6aBWOlnPdLuHhds/kcanFAEppj5yN0tVWDnqjOJjR7EpxMSdP3TSd\n6tNAY73LGNLNJQc6tSxh8nMIb4HhSWQSgfof+FwcLGvs+mmyBq8Jz5Zy4BSCk1fQ\nFmCnSGyzpyBD0vMd6eLHk2l0tm56DrlonbDMX8KGs7e9ZgjANkT5PnipLOaeLJU4\nH+OWyBZUAT4hl/iRVvLwV81x7g0/O38kmPYJDQIDAQABAoIBAFb7wyhEIfuhhlE9\nuryrb2LrGzJlMIq7qBWOouKhLz4SjIM/VGw+c76VkjZGoSU+LeLj+D0W1ie0u2Cw\ngJM8aW22TbK/c5lksWOO5PVFDdPG+ZoRWY3MLGlhlL5E4UhMPgJyy/eeiRjZ3CZM\npja+UfVAwn1KVNR8UinVZYPt680AvEd1FGxoNLxemIPNug46nNqp6Al86Bn+BnkN\nGXpwyooXVSfo4k+pnFBFIXUdA1dUEXQSVb1AxlTo6g/Ok/+8Gfq8idCdu+5fcZI2\n1eLeC+FAa92rr1SFX/UWeB4cMyuAqwuxbFFIplT22SaUSsNuOUSH4E00nbP/AuCb\n1BqrLmECgYEA7tQKfyF9aiXTsOMdOnSAa5OyEaCfsFtcmLd4ykVrwN8O36NoX005\nVbGuqo87fwIXQIKHU+kOEs/TmaQ8bNcbCD/SfWGTtOnHG4qfIsepJuoMwbQHRhGF\nJeoXh5yEUKg5pcDBY8PENEtEVKmFuL4bPOdn+9FNLGsjftvXpmGWbGUCgYEA6uuQ\n7kzO6WD88OsxdJzlJM11hg2SaSBCh3+5tnOhF1ULOUt4tdYXzh3QI6BPX7tkArYf\nXteVfWoWqn6T7LtCjFm350BqVpPhqfLKnt6fYf1yotsj/cyZXlXquRbxbgakB0n0\n4PrsZaube0TPPVeirzNyOVHyFc+iW+F+IUYD+4kCgYEApDEjBkP/9PoMj4+UiJuP\nrmXcBkJnhtdI0bVRVb5kVjUEBLxTBTISONfvPVM7lBXb5n3Wi9mt00EOOJKw+CLq\ncsFt9MUgxz/xov2qaj7aC+bc3k7msUVaRLardpAkZ09AUrQyQGRWf50/XPUu+dO4\n5iYxVu6OH/uIa664k6qDwAECgYEAslS8oomgEL3VhbWkx1dLA5MMggTPfgpFNsMY\n4Y4JXcLrUEUgjzjEvW0YUdMiLhP8qapDSiXxj1D3f9myxWSp8g0xc9UMZEjCZ9at\nRcjNyP8zBLnCKqokSt6B3puyDsnvvrC/ugIBbnTFBOCJSZG7J7CwJx8z3KbQI1ub\n+fpCj7ECgYAd69soLEybUGMjsdI+OijIGoUTUoZGXJm+0VpBt4QJCe7AMnYPfYzA\nJnEmN4D7HLTKUBklQnb/FhP/RuiT2bSAd1l+PNeuU7gYROCBBonzxXQ1wEbNrSYA\niyoc9g/kvV8HTW8361xEhu7wmuSEEx1gQ/7sdhTkgrTncc8hxVRxuA==\n-----END RSA PRIVATE KEY-----\n"), + resource.TestCheckResourceAttr(fqrn, "public_key", fmt.Sprintf("%s\n", os.Getenv("JFROG_TEST_RSA_PUBLIC_KEY"))), + resource.TestCheckResourceAttr(fqrn, "private_key", fmt.Sprintf("%s\n", os.Getenv("JFROG_TEST_RSA_PRIVATE_KEY"))), resource.TestCheckResourceAttr(fqrn, "alias", fmt.Sprintf("test-alias-%d", id)), resource.TestCheckResourceAttr(fqrn, "pair_type", "RSA"), resource.TestCheckResourceAttr(fqrn, "passphrase", "new-password"),