From 587c4a972114f9b4b845bf05e1c775fadd5c0a6e Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 5 Jun 2026 15:14:01 -0400 Subject: [PATCH 1/4] Migrate to running vault with Testcontainers --- config/ca/certs/ca.cert.pem | 23 ++++ config/ca/certs/client.cert.pem | 24 ++++ config/ca/certs/localhost.cert.pem | 27 ++++ config/ca/client.p12 | Bin 0 -> 2811 bytes config/ca/csr/client.csr.pem | 17 +++ config/ca/csr/localhost.csr.pem | 18 +++ config/ca/index.txt | 2 + config/ca/index.txt.attr | 1 + config/ca/index.txt.attr.old | 1 + config/ca/index.txt.old | 1 + config/ca/newcerts/1000.pem | 27 ++++ config/ca/newcerts/1001.pem | 24 ++++ config/ca/private/ca.key.pem | 30 +++++ config/ca/private/client.decrypted.key.pem | 28 ++++ config/ca/private/client.key.pem | 30 +++++ config/ca/private/localhost.decrypted.key.pem | 28 ++++ config/ca/private/localhost.key.pem | 30 +++++ config/ca/serial | 1 + config/ca/serial.old | 1 + config/client-cert.jks | Bin 0 -> 2380 bytes config/keystore.jks | Bin 0 -> 1350 bytes config/vaultconfig.json | 15 +++ pom.xml | 18 +-- spring-cloud-vault-config-aws/pom.xml | 6 - .../config/aws/AwsSecretIntegrationTests.java | 2 +- .../vault/config/aws/VaultConfigAwsTests.java | 2 +- spring-cloud-vault-config-consul/pom.xml | 6 - .../consul/ConsulSecretIntegrationTests.java | 2 +- .../DiscoveryBootstrapConfigurationTests.java | 2 +- .../vault/config/consul/SetupConsul.java | 6 +- .../VaultConfigConsulConfigDataTests.java | 2 +- .../config/consul/VaultConfigConsulTests.java | 8 +- spring-cloud-vault-config-databases/pom.xml | 6 - .../CassandraSecretIntegrationTests.java | 2 +- .../CouchbaseSecretIntegrationTests.java | 2 +- .../ElasticsearchSecretIntegrationTests.java | 2 +- .../MongoSecretIntegrationTests.java | 2 +- .../MySqlDatabaseSecretIntegrationTests.java | 2 +- .../MySqlSecretIntegrationTests.java | 2 +- .../PostgreSqlSecretIntegrationTests.java | 2 +- .../databases/VaultConfigCassandraTests.java | 2 +- .../VaultConfigCouchbaseDatabaseTests.java | 2 +- .../databases/VaultConfigCouchbaseTests.java | 2 +- .../databases/VaultConfigMongoTests.java | 2 +- .../VaultConfigMySqlDatabaseTests.java | 2 +- ...ultConfigMySqlDatabasesBootstrapTests.java | 2 +- .../VaultConfigMySqlDatabasesTests.java | 2 +- .../databases/VaultConfigMySqlTests.java | 2 +- .../databases/VaultConfigPostgreSqlTests.java | 2 +- spring-cloud-vault-config-rabbitmq/pom.xml | 6 - .../RabbitMqSecretIntegrationTests.java | 2 +- .../rabbitmq/VaultConfigRabbitMqTests.java | 2 +- spring-cloud-vault-config/pom.xml | 5 +- .../vault/config/VaultConfigAppRoleTests.java | 2 +- ...ultConfigCubbyholeAuthenticationTests.java | 2 +- .../config/VaultConfigKubernetesTests.java | 6 +- .../VaultConfigTemplateIntegrationTests.java | 2 +- .../cloud/vault/config/VaultConfigTests.java | 5 +- ...igTlsCertAuthenticationMountPathTests.java | 4 +- ...VaultConfigTlsCertAuthenticationTests.java | 4 +- .../vault/config/VaultNamespaceTests.java | 15 +-- .../VaultPropertySourceIntegrationTests.java | 2 +- .../VaultVersionedKvBackendConfigTests.java | 2 +- .../cloud/vault/util/Settings.java | 32 ++--- .../cloud/vault/util/VaultRule.java | 124 ++++++++++++++++-- .../src/test/resources/logback-test.xml | 17 +++ 66 files changed, 528 insertions(+), 124 deletions(-) create mode 100644 config/ca/certs/ca.cert.pem create mode 100644 config/ca/certs/client.cert.pem create mode 100644 config/ca/certs/localhost.cert.pem create mode 100644 config/ca/client.p12 create mode 100644 config/ca/csr/client.csr.pem create mode 100644 config/ca/csr/localhost.csr.pem create mode 100644 config/ca/index.txt create mode 100644 config/ca/index.txt.attr create mode 100644 config/ca/index.txt.attr.old create mode 100644 config/ca/index.txt.old create mode 100644 config/ca/newcerts/1000.pem create mode 100644 config/ca/newcerts/1001.pem create mode 100644 config/ca/private/ca.key.pem create mode 100644 config/ca/private/client.decrypted.key.pem create mode 100644 config/ca/private/client.key.pem create mode 100644 config/ca/private/localhost.decrypted.key.pem create mode 100644 config/ca/private/localhost.key.pem create mode 100644 config/ca/serial create mode 100644 config/ca/serial.old create mode 100644 config/client-cert.jks create mode 100644 config/keystore.jks create mode 100644 config/vaultconfig.json create mode 100644 spring-cloud-vault-config/src/test/resources/logback-test.xml diff --git a/config/ca/certs/ca.cert.pem b/config/ca/certs/ca.cert.pem new file mode 100644 index 000000000..04233f258 --- /dev/null +++ b/config/ca/certs/ca.cert.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIDzTCCArWgAwIBAgIUdMU6u5VkfsEvQflFJdNkTAH4OgswDQYJKoZIhvcNAQEL +BQAwbjELMAkGA1UEBhMCTk4xEDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vu +a25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNV +BAMMDkNBIENlcnRpZmljYXRlMB4XDTI2MDYwNDE2NTgyOFoXDTQ2MDUzMDE2NTgy +OFowbjELMAkGA1UEBhMCTk4xEDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vu +a25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNV +BAMMDkNBIENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAkQ5xZX+5svDY0B5fJqm+PZDxdThRbRHJfwiR9zZHvXGlRDor585ScfRDwTQB +BHSM/Byf4vz03ondfdgGjthKp1ukepyhNNwDakzYaG0VfMb6vVOJlpf0M83GqKvX +NjMHnJX//vOc/cebXoAa8v6OdLUODzU4i4v+u3fZXlrKDD88nJLFPQfZ+2+PeJmy +/LPKpwhUBDzKtCnfXv8760a+PxKVbKjCvyW1Al4ZbjK4GNEeqqlycYLnNjEB4m1E +6bYF6ffW5+s5Sh+762qMAyWbvHWPmcIqMUjYiE/H74LRYK81jdmiE9NjGsSABAsM +ttXzp6/oLfIuWqTeHEHDzST23QIDAQABo2MwYTAdBgNVHQ4EFgQUdENb5YdJeMjE +xci1vAK4lPJ94uEwHwYDVR0jBBgwFoAUdENb5YdJeMjExci1vAK4lPJ94uEwDwYD +VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggEB +ADh/hapOD9fZ030itGWupSn93dwdokw7SNYao9UWAjZ5HXNdI0EEo1+ClxxMH5P7 +An8tcxjVZCmmwpa6C6E07kkEAudhzs7WxJ0jl9CUTKLnnG7GXl7hjDAGjCTeVtNp +32Ry9V1TN3kJTmc0k67EoPuMvUOpwTC3bsxlvHjgrL7DqoEz6eScBLDQ0xAgNFKd +e3I9TCnI42MdJziFbZrp5A+bB6/x3wPFjiA0Q7DsrkdZbbnwRFWICHYks0jIapi3 +5zrLQxbu3FqUVtJVBLGyTZBpZ3l8oImKCRCpKQuelSeRl1loRCFGWgM8IG777kSN +loJjNF6lkzJgegInVsYtw2s= +-----END CERTIFICATE----- diff --git a/config/ca/certs/client.cert.pem b/config/ca/certs/client.cert.pem new file mode 100644 index 000000000..cb0f4da73 --- /dev/null +++ b/config/ca/certs/client.cert.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEBDCCAuygAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwbjELMAkGA1UEBhMCTk4x +EDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNw +cmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNVBAMMDkNBIENlcnRpZmljYXRl +MB4XDTI2MDYwNDE2NTgyOFoXDTI3MDYxNDE2NTgyOFowVDELMAkGA1UEBhMCTk4x +EDAOBgNVBAgMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1j +b25maWcxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBANZ8wYRBM3xqsyCLCPp9DJsJhSq/ft4XR28gx8Jz84HBLP0nMnjbzRun +eAIWNDDXNqoT9yK3qOTrmK/UfYXI04zAAdEEUq6wBGCNaWQg83hgCXHtznH1qcvR +bMk97L8wZQcHiFKpdgpPpdgoIVkja8kFaKqjAcIurvNCzWmQ3HquxlKjbtITkVvB +R+WNP1wJ6eSyKIthBIgaY5R6pUsSRIMLqhp7JOoTjKDl7mX6lH2W+aGrAoAmpdjc +QM2QPDeNhQt33ZUsEthvW7o8wAWEJ8qkk1rgHXBDkWUTvqj8ULCcDbODgo4E5rNq +/SoO4RQKuPVSEK78RdiwHDTO/sSwPa8CAwEAAaOBxTCBwjAJBgNVHRMEAjAAMBEG +CWCGSAGG+EIBAQQEAwIFoDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0 +ZWQgQ2xpZW50IENlcnRpZmljYXRlMB0GA1UdDgQWBBT31Jb2d3qFeTsTLgRCJApI +oD1xojAfBgNVHSMEGDAWgBR0Q1vlh0l4yMTFyLW8AriU8n3i4TAOBgNVHQ8BAf8E +BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEB +CwUAA4IBAQBZ8eZeRiaQz30Db5g5MQVOyGEd0Tz3L9sAPYvKm/0bP0I6nJOxYSI/ +S9Gn5g3Hzp8ZytQtqv0HVY6yQuNmI2KC/aRYhIqaD31C6cXps6bVauJlRhotXyCv ++n9OSXi2jx3wLr//Hb1UL9LyyUEpawaQcH70BQBaxYRkd2cL0wsGg4fnEnn5o2WU +sbmfiySBSFhf3hdXYd2lUJ8kK97NaISrgjo9k8rszKOB63KrBsyoiIzuHoDOE50r +DFDmShWUn6HyX3kGn+lo5KwhV3gm4mYdWExDB7DnWKp7f/38qOfC/FsUIhKxH2IZ +K92f+pBhZgzz1K3V6ehW9Jq1DE6Nelu5 +-----END CERTIFICATE----- diff --git a/config/ca/certs/localhost.cert.pem b/config/ca/certs/localhost.cert.pem new file mode 100644 index 000000000..eeef5724c --- /dev/null +++ b/config/ca/certs/localhost.cert.pem @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEqDCCA5CgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwbjELMAkGA1UEBhMCTk4x +EDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNw +cmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNVBAMMDkNBIENlcnRpZmljYXRl +MB4XDTI2MDYwNDE2NTgyOFoXDTI3MDYxNDE2NTgyOFowVzELMAkGA1UEBhMCTk4x +EDAOBgNVBAgMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1j +b25maWcxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAKtlC64hAbwQjCAEJ3n07/xiC5hKSqfnEcbqySn0vd3pCULbcjKX +Bx7PZj3l6rjzg9prI5AjGWsjDGCVgE6qpuJMmY6T4wGaloriNamBzlxk4qvYrcb0 +xK2aLA4oMjhghwXQ4UA1rfVTBvIk1CSMmOCgMPC7c8gRXCDEjnqtpCgRX/hgbFeU +QfaYj1j+eaFlb1apGhUi6wwA/nw5ZPcU4s02/rFRx99+0Xrr9yuTTsFOXf7DIzaU +7sGM2ozs48QwygFSSO0yiOwBS73juRi4FdOZpsfRvdx1TmLayg9nEUvrZjK4kI6G +3tapI8bsx+joV4SFAS4ZdZPNb9YiVfS72P8CAwEAAaOCAWUwggFhMAkGA1UdEwQC +MAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdl +bmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFClBwTMMsc6O34Dx +5u0Keho5Gl9uMIGrBgNVHSMEgaMwgaCAFHRDW+WHSXjIxMXItbwCuJTyfeLhoXKk +cDBuMQswCQYDVQQGEwJOTjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UEBwwHVW5r +bm93bjEiMCAGA1UECgwZc3ByaW5nLWNsb3VkLXZhdWx0LWNvbmZpZzEXMBUGA1UE +AwwOQ0EgQ2VydGlmaWNhdGWCFHTFOruVZH7BL0H5RSXTZEwB+DoLMA4GA1UdDwEB +/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAaBgNVHREEEzARgglsb2NhbGhv +c3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBAErElDPyFnYxTSWlES8NkYxA4qKF +C9G+50d/Q7OXOQPuMYHGEBT3fb+w2kODa1er691Zjf6uWiDFtGMDZLISqVWUzoKr +pK8Erekph6bFmbaAjnv4j2zOJtVidPPsIeaS564L/LxLOPpxa98YrgrLLUpLCPcf +8mznJf4oLCvQkj6cCSW6qskaPDXQcbEu5dUn6vds2g/3UVjPmmrWZlCfOFvXTBiP +8RbuH5yKROpA9dZmRrOQMXpHsny7vAJ6DFzL5WU2m1eMzWDl/XNdVhQ8az98ppFc +eKt6CAxAc+frITdhzQdFqpPiksFU74Oeu5Tlc1m3NMA0lMpAyeTXqZKS64s= +-----END CERTIFICATE----- diff --git a/config/ca/client.p12 b/config/ca/client.p12 new file mode 100644 index 0000000000000000000000000000000000000000..fd17a9fc5e43bb55d24f4d5040c545e6e288a082 GIT binary patch literal 2811 zcmai$X*3iH8^;Y}>{+s8*VswTP?Tnrk#z`#5M@b}eKM9BVXVp6#=Z#m<$nK@)?CvzM4FD4A$1$-WC5zkA8rZF^6zOyTi_{x5n&?bTmnn)#&& zm4gX4{BGISGqWSq%szdh8cKX3Wj?E^07i=PuQ-_T^YW)7U?e#wV^s|O6}oW4YR70R z+Tj`tZKV0dvC(^mc45tsO3fe-RZgieG12Al9ShUxp^~yCwPwq<6oH@LsYn+_`iG&? zYTaDO(<&{q{JGwE0zR|CCb&ut`Or_g^;5$M43RZ*+dghKEv=>b;eq;oXIYRRPnhUe4^@ zvMWi`Eh@TOVyB3Ru6b~pEcC0FD^)$P;$FSrHxpmz+aFS=V#D#9i+~1x%up;|6sf;s_o*R*d*-@?Rwyu48+lSLu=`qkDh9?qWqRzIr)U- z=(wNS=U=xgkm-5#W+RvRO&u;AZta3b)z~m;q5OQC$2VWs6HhIeV4^#@mZp?Q!tG^W zfohJva`Q2i)dJqzIAr))v2qpSq}P_9`g@0RHk1BQT5(lzB(`s6J&{T0LScJ_PtU*$ zif<^2S^ks11CJ?S&9?7ikI3L*dQ+-}Ql6%Atscr=4epyjTIYx$@au0Ds&H@j?eaN0 z)B3z=_LD()n9c}!a&-KMzRwMLE3Q`>rW}Kbv-`)S39bgDr%7Acpn+-eeV!ll`)x1 z;zM4xld!AVIVZGwx(906(8bc#%6lb5iDk`z~1*5%b6?$ll7}N2rZ&KXSgXQ;_Lj4!)KHAlILa@wn ze?0b&7@32CSmvPL82x*EK^*^gCMP?9@ppOYH@xs)BAlxOososCPXjNmKP?Rd*Z-#o zA)Q!#GDktu?r9h?G5WG85DR>7Oa*t+_z>6fC@hYyX?rY;uYEYW7&4t&akB65_4Log z6}f=ZtbRodmnm1xZ`=B7F@Y3iG;PD1nK|pux!$T^*4xdx=|1Rznk8_uOBI7i52EsG zqj6%Rk%Pr(TE6~!4>MU9)Mi*#0+{zQRwp1~^gaq#Qt1lra*OZ6M6>jEZ3mgxZzXAT zHT-CzP^COPQEX$adx|$#E96Hjqt;UT$@2?yMOOb^a2`N9ckg1dRnDaRZ>vB^cC}9 z#0*2E_x#He|JAYS2!NIR-l>SvK84Yjbuh|EHh6xurojZ)f7X3}A*8^$V=z0yN-&ry z?-2X^M>sqcdchJJQrqeA_})ryh(YC~eD1Kd-g(q<)iV(&Oy!-lllv18I5!+&BRH-ir+koaV$VCT>yJn?)go+lT6&AdojGMvPnwHnH2NHVa-xMo z$P1j}tZjB%m+R2h*f&K~Sy(MP&z-*2yxk*owkr{>y6~WtNP_N%P1|>mgKWpWGBBq1C9|bCCC}nUwt%k;foLU8HK8h!Cbbp!-!umJ$pq7o&v+V39yH}8 zZK7dYrQd&*&Bt>vOo#}+N;`S#s)M(Bb=c4^Ie#SNrd&VNM~D!)?#$hKI=*=;E+Zda zws8)p4bXrLvEH*Od^xe*Uaylrsa{cf6pA1Il2>y(R{$!_uhw0~_lT*6cDjG0M5gzf zHsJz3p+U>NzO}nzKm2~1?(*Gtfr$g)ygI6^<%v}r-A0)+N-hcyU7@a(;Ff|3`E`kc zx#z|}a-iWkX9fS+yN4J2oYJ>wT>6u!@J<_yYwAGvE$OaVUR?KhXB{>9l0}V`;n|Fa zv)$^N>c3LHjSUcIf)~Wb%$H%esI%369!R9EHLUN@A9OegaUjZ2=m5UJ+1WHPFc(5fo-e# z`{fWg`qa_TB`|f0jlElMGmdBJIGSQ5S2V}d;%6JwP%XL}N04fONpUSX88uIvw?~D|?OK8>L2wNu(A%+krgzL|n$OvF&07_L-H{(ow zv2RhCLEDJJpZC*i4<>N`LlCEdzKWXXwd)*Yyv&^ANgf0X+-O`|!O literal 0 HcmV?d00001 diff --git a/config/ca/csr/client.csr.pem b/config/ca/csr/client.csr.pem new file mode 100644 index 000000000..d1714e650 --- /dev/null +++ b/config/ca/csr/client.csr.pem @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICqzCCAZMCAQAwZjELMAkGA1UEBhMCTk4xEDAOBgNVBAgMB1Vua25vd24xEDAO +BgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1jb25m +aWcxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBANZ8wYRBM3xqsyCLCPp9DJsJhSq/ft4XR28gx8Jz84HBLP0nMnjbzRuneAIW +NDDXNqoT9yK3qOTrmK/UfYXI04zAAdEEUq6wBGCNaWQg83hgCXHtznH1qcvRbMk9 +7L8wZQcHiFKpdgpPpdgoIVkja8kFaKqjAcIurvNCzWmQ3HquxlKjbtITkVvBR+WN +P1wJ6eSyKIthBIgaY5R6pUsSRIMLqhp7JOoTjKDl7mX6lH2W+aGrAoAmpdjcQM2Q +PDeNhQt33ZUsEthvW7o8wAWEJ8qkk1rgHXBDkWUTvqj8ULCcDbODgo4E5rNq/SoO +4RQKuPVSEK78RdiwHDTO/sSwPa8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQAZ +idhPze8jR2e4AsTk0m6JXjG2CA4ZO/jfRjsVT5vnekn3wvuq/mG+ywKv8khn+CnZ +Zut6Cw63CrCfJkS64gQMrMznDsChwUXONmCIYY6mQ6AK7O/YwkhnMimI1jXrSWzJ +qS4YPjzfD8r5JwQCfX7rwxf+yPwYeWfv4K1HW3ECPjlctKtnBkYU3bP56AsO37MK +XU8zjXI0bsnF/NbjSA95jm61PouxSF8ILQCrPNm18I4slN8hqyKSxL27dkiv7Ym9 +4S/dQQPjJ51lVGD0lg4A1vACUwRi5ydxzdG/RO6lOIeHmfHTpqOf64DRIiBnbkLP +tlOD66pvSWAtbO4hKZXD +-----END CERTIFICATE REQUEST----- diff --git a/config/ca/csr/localhost.csr.pem b/config/ca/csr/localhost.csr.pem new file mode 100644 index 000000000..d1c8b8ad7 --- /dev/null +++ b/config/ca/csr/localhost.csr.pem @@ -0,0 +1,18 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIC2zCCAcMCAQAwaTELMAkGA1UEBhMCTk4xEDAOBgNVBAgMB1Vua25vd24xEDAO +BgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1jb25m +aWcxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAKtlC64hAbwQjCAEJ3n07/xiC5hKSqfnEcbqySn0vd3pCULbcjKXBx7P +Zj3l6rjzg9prI5AjGWsjDGCVgE6qpuJMmY6T4wGaloriNamBzlxk4qvYrcb0xK2a +LA4oMjhghwXQ4UA1rfVTBvIk1CSMmOCgMPC7c8gRXCDEjnqtpCgRX/hgbFeUQfaY +j1j+eaFlb1apGhUi6wwA/nw5ZPcU4s02/rFRx99+0Xrr9yuTTsFOXf7DIzaU7sGM +2ozs48QwygFSSO0yiOwBS73juRi4FdOZpsfRvdx1TmLayg9nEUvrZjK4kI6G3tap +I8bsx+joV4SFAS4ZdZPNb9YiVfS72P8CAwEAAaAtMCsGCSqGSIb3DQEJDjEeMBww +GgYDVR0RBBMwEYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQCP +fVeajKrN4/xJjMwwJDBP00vtM6NBL2/E8y6KXkzIDJ7C5hE10h4opMpSjL/24KH3 +JjvJhb62R3CaD3Sjq2jf/tKQiH05AUOHwCnXx4UFxSrQpQK5g5oNwOWCb2tBegkh +I+qCTLSOl2m9dRNyVCRFzmbquQBamQJsLGQVJzYbJmsZ+6crmDU6hOSFhdykriIf +iMajm3gHewjA6AviIFO8ww+AD+FJa/jek+dYNCpuryQmoEX2eDGjZvoRMTuA1nka +4Vrqoa8zOpputRXG1BqAShtO6R2fdC7izfCavBjroGaEqDyJuYCOH201wXdmluXN +v8W1R1A0HiuQj+9UbKfu +-----END CERTIFICATE REQUEST----- diff --git a/config/ca/index.txt b/config/ca/index.txt new file mode 100644 index 000000000..148654d3b --- /dev/null +++ b/config/ca/index.txt @@ -0,0 +1,2 @@ +V 270614165828Z 1000 unknown /C=NN/ST=Unknown/O=spring-cloud-vault-config/CN=localhost +V 270614165828Z 1001 unknown /C=NN/ST=Unknown/O=spring-cloud-vault-config/CN=client diff --git a/config/ca/index.txt.attr b/config/ca/index.txt.attr new file mode 100644 index 000000000..8f7e63a34 --- /dev/null +++ b/config/ca/index.txt.attr @@ -0,0 +1 @@ +unique_subject = yes diff --git a/config/ca/index.txt.attr.old b/config/ca/index.txt.attr.old new file mode 100644 index 000000000..8f7e63a34 --- /dev/null +++ b/config/ca/index.txt.attr.old @@ -0,0 +1 @@ +unique_subject = yes diff --git a/config/ca/index.txt.old b/config/ca/index.txt.old new file mode 100644 index 000000000..bc41fdea8 --- /dev/null +++ b/config/ca/index.txt.old @@ -0,0 +1 @@ +V 270614165828Z 1000 unknown /C=NN/ST=Unknown/O=spring-cloud-vault-config/CN=localhost diff --git a/config/ca/newcerts/1000.pem b/config/ca/newcerts/1000.pem new file mode 100644 index 000000000..eeef5724c --- /dev/null +++ b/config/ca/newcerts/1000.pem @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE----- +MIIEqDCCA5CgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwbjELMAkGA1UEBhMCTk4x +EDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNw +cmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNVBAMMDkNBIENlcnRpZmljYXRl +MB4XDTI2MDYwNDE2NTgyOFoXDTI3MDYxNDE2NTgyOFowVzELMAkGA1UEBhMCTk4x +EDAOBgNVBAgMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1j +b25maWcxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEP +ADCCAQoCggEBAKtlC64hAbwQjCAEJ3n07/xiC5hKSqfnEcbqySn0vd3pCULbcjKX +Bx7PZj3l6rjzg9prI5AjGWsjDGCVgE6qpuJMmY6T4wGaloriNamBzlxk4qvYrcb0 +xK2aLA4oMjhghwXQ4UA1rfVTBvIk1CSMmOCgMPC7c8gRXCDEjnqtpCgRX/hgbFeU +QfaYj1j+eaFlb1apGhUi6wwA/nw5ZPcU4s02/rFRx99+0Xrr9yuTTsFOXf7DIzaU +7sGM2ozs48QwygFSSO0yiOwBS73juRi4FdOZpsfRvdx1TmLayg9nEUvrZjK4kI6G +3tapI8bsx+joV4SFAS4ZdZPNb9YiVfS72P8CAwEAAaOCAWUwggFhMAkGA1UdEwQC +MAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdl +bmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFClBwTMMsc6O34Dx +5u0Keho5Gl9uMIGrBgNVHSMEgaMwgaCAFHRDW+WHSXjIxMXItbwCuJTyfeLhoXKk +cDBuMQswCQYDVQQGEwJOTjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UEBwwHVW5r +bm93bjEiMCAGA1UECgwZc3ByaW5nLWNsb3VkLXZhdWx0LWNvbmZpZzEXMBUGA1UE +AwwOQ0EgQ2VydGlmaWNhdGWCFHTFOruVZH7BL0H5RSXTZEwB+DoLMA4GA1UdDwEB +/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAaBgNVHREEEzARgglsb2NhbGhv +c3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBAErElDPyFnYxTSWlES8NkYxA4qKF +C9G+50d/Q7OXOQPuMYHGEBT3fb+w2kODa1er691Zjf6uWiDFtGMDZLISqVWUzoKr +pK8Erekph6bFmbaAjnv4j2zOJtVidPPsIeaS564L/LxLOPpxa98YrgrLLUpLCPcf +8mznJf4oLCvQkj6cCSW6qskaPDXQcbEu5dUn6vds2g/3UVjPmmrWZlCfOFvXTBiP +8RbuH5yKROpA9dZmRrOQMXpHsny7vAJ6DFzL5WU2m1eMzWDl/XNdVhQ8az98ppFc +eKt6CAxAc+frITdhzQdFqpPiksFU74Oeu5Tlc1m3NMA0lMpAyeTXqZKS64s= +-----END CERTIFICATE----- diff --git a/config/ca/newcerts/1001.pem b/config/ca/newcerts/1001.pem new file mode 100644 index 000000000..cb0f4da73 --- /dev/null +++ b/config/ca/newcerts/1001.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEBDCCAuygAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwbjELMAkGA1UEBhMCTk4x +EDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNw +cmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNVBAMMDkNBIENlcnRpZmljYXRl +MB4XDTI2MDYwNDE2NTgyOFoXDTI3MDYxNDE2NTgyOFowVDELMAkGA1UEBhMCTk4x +EDAOBgNVBAgMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1j +b25maWcxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBANZ8wYRBM3xqsyCLCPp9DJsJhSq/ft4XR28gx8Jz84HBLP0nMnjbzRun +eAIWNDDXNqoT9yK3qOTrmK/UfYXI04zAAdEEUq6wBGCNaWQg83hgCXHtznH1qcvR +bMk97L8wZQcHiFKpdgpPpdgoIVkja8kFaKqjAcIurvNCzWmQ3HquxlKjbtITkVvB +R+WNP1wJ6eSyKIthBIgaY5R6pUsSRIMLqhp7JOoTjKDl7mX6lH2W+aGrAoAmpdjc +QM2QPDeNhQt33ZUsEthvW7o8wAWEJ8qkk1rgHXBDkWUTvqj8ULCcDbODgo4E5rNq +/SoO4RQKuPVSEK78RdiwHDTO/sSwPa8CAwEAAaOBxTCBwjAJBgNVHRMEAjAAMBEG +CWCGSAGG+EIBAQQEAwIFoDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0 +ZWQgQ2xpZW50IENlcnRpZmljYXRlMB0GA1UdDgQWBBT31Jb2d3qFeTsTLgRCJApI +oD1xojAfBgNVHSMEGDAWgBR0Q1vlh0l4yMTFyLW8AriU8n3i4TAOBgNVHQ8BAf8E +BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEB +CwUAA4IBAQBZ8eZeRiaQz30Db5g5MQVOyGEd0Tz3L9sAPYvKm/0bP0I6nJOxYSI/ +S9Gn5g3Hzp8ZytQtqv0HVY6yQuNmI2KC/aRYhIqaD31C6cXps6bVauJlRhotXyCv ++n9OSXi2jx3wLr//Hb1UL9LyyUEpawaQcH70BQBaxYRkd2cL0wsGg4fnEnn5o2WU +sbmfiySBSFhf3hdXYd2lUJ8kK97NaISrgjo9k8rszKOB63KrBsyoiIzuHoDOE50r +DFDmShWUn6HyX3kGn+lo5KwhV3gm4mYdWExDB7DnWKp7f/38qOfC/FsUIhKxH2IZ +K92f+pBhZgzz1K3V6ehW9Jq1DE6Nelu5 +-----END CERTIFICATE----- diff --git a/config/ca/private/ca.key.pem b/config/ca/private/ca.key.pem new file mode 100644 index 000000000..40ca2ffc8 --- /dev/null +++ b/config/ca/private/ca.key.pem @@ -0,0 +1,30 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQfUVCLQdqKAsGDNAl +AUFtoQICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEND7NGH6uvK+KiG6 +jhZDK5MEggTQbzSpDqmUyh0AJLSbS9a70sSZTGS/uO4mESszO2ifiCatQreC0XdQ +jx0vqJHlFEgd9ZZVIKHIy5hI9sPoCGXoaICr33DywD+qgH18meL6AmNu6NZNlR/K +6SOtvUZib48bK/HYoU3psET7FFVd+QysWMnNmjgm6crE3KY77Mu5jDNKjIumDT20 +sS9L2MHZCwXIk+0EMe7yr6iCWcEScotL0DE6F/ImvDwiceL66uzxjfDcg7FP+jP8 +bACDb08NFAfUrlEPB4b78OAWQNZS4Xx/LjQYRLW3X7KHSneOmJEPbpsDxUpZpnYm +g8kVDvubODLpvORE3EEz429iDAmSHYjloG04j3ipvPhJSShD+PG7voGVPgnjhHDq +hoaJqLogPeZJ8TduyxoTWDZhAewpnlFfAqkJgX7bGlS27UnrKkmZJ7w2NtRoDuCJ +1oDs/CI5ky1H7vGx++BhfX+BHxUQ/siMJWYGl6EeMHUBuCGQSKVwm5XTSl2k1Usn ++eXvgtaiHGvg8fey+g7AQ6WKKXZyXsmLc19bR1Bgj+p3ga5F72a19DRd44X3bN6k +tTHzRgwz1BtkRJZoWBgXLhu2tU41HCU++8cUKOoItH71WvNB4F5v0fAxlfZXpTlT +yPe77e1JEeTuOfwi/NLu5uV/cdU5SVU/B5/nBSD/7S+l4oPt4Y0WHdyMFDxFwOKh +2wiis9kjI6i9S+05J7XmCvXT3W/c6yla/7PLwpgV69+4prPIaq6nooMQG3rkK/O+ +Bqp34O9OW+97UxzZu85e21cITL+4PuZpfUlbXetwUqz9mnNfpOMlvIwQp2FhhHiD +LbBaDMyssKR1thJayGEFiguM++fempf0G3lfFbplEaulV7hrGKIfXavH6R8if0QR +IFZbUwTVgSQMfAKNkBXnzV0tT8NGAuL56nWJzJERDrpjIe96aXeolECP2AO9i2uT +jAkYt0fcnJl+TrYMno+y6QdWd7D3i3rBsZjl+grqg5AJA2Cj0/WEHhvXsGZLWwMZ +9eLJuxVn9TcH5LnGu8NjChyI7Y4gOMBnj0rkhrb/h0WgG4HOymsiWSfHfyqMQ3mo +5423NM2nY/YmPSkv9pCamVGfKLJpO/7ndDclU55EYKNf1NxOF48LA00K2Kb2Ig2I +EwxDS9pbcUORqeEy/IpO9ElFuwYq1gh18/BYWNFLvYAJXBHBKu5DpD4TKAuhOyWV +/zmYogZsGPkUqHSHXmf4/h03pBg9afhohOh3KVdGuxfV7MEW7YUqUMYplHBXsNan +9NXM+z/SCrE7Oie6ZPZaYPNhgDSy8rjnbEMRdL95T/oMlibvrB1e7Cdy+5UNwjG2 +tIMvsbZe80/9kWnohYO/6D5mxlmOfn2EYcdBf67r8UJu0kdUKV0DwfyHVxLybUhF +RxVYnpldezWxxlQW6Xi2iVwe5djpzBYlQMHD/AExD78hiqDRB7+NUcAOOJ+KUYu9 +EXDF9RBNMpJL8BV1gbZNphsfQsfolexbgOl8O4bAYljxMxy7OGZCxe32EteJnMxs +TWQxdJsMxPbASoyp5R4BX27fsmPmfN4kyC8hbjOWtfaQyLoiYdMrRN4q2g4HWOuu +cpnbnal8S+3iIJAaffYy8RcnavIY6U0iF2XMU0Wpk/YEyHPapdNZxiU= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/config/ca/private/client.decrypted.key.pem b/config/ca/private/client.decrypted.key.pem new file mode 100644 index 000000000..366c391db --- /dev/null +++ b/config/ca/private/client.decrypted.key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDWfMGEQTN8arMg +iwj6fQybCYUqv37eF0dvIMfCc/OBwSz9JzJ4280bp3gCFjQw1zaqE/cit6jk65iv +1H2FyNOMwAHRBFKusARgjWlkIPN4YAlx7c5x9anL0WzJPey/MGUHB4hSqXYKT6XY +KCFZI2vJBWiqowHCLq7zQs1pkNx6rsZSo27SE5FbwUfljT9cCenksiiLYQSIGmOU +eqVLEkSDC6oaeyTqE4yg5e5l+pR9lvmhqwKAJqXY3EDNkDw3jYULd92VLBLYb1u6 +PMAFhCfKpJNa4B1wQ5FlE76o/FCwnA2zg4KOBOazav0qDuEUCrj1UhCu/EXYsBw0 +zv7EsD2vAgMBAAECggEATVjQ6lIe8HuD3DT3SGlm7dPZj2heJlXrv0Hpd5Cb3Atf +H22OsHHHPfU+/DWonYJGpr+ra/wiLmddeO7eUyvwSf4FyavO60rzUSQ9wMt3MU4k +qc6Rl5v5HtSHb+ziXrHjhMztFq4gsKg3TMNv/zacTHIkZACDhlSSZ4wMCkkgkSaj +fYzS/BbWduu76qhSkwKdjfQhZ+IFYdLDW5Cb1GAK+s1HFWSCSZ5J7xTSse87h48H +lQewjJJ2qRp9b3QtBUkM9LaJnUQ6S2UfuZUT/y39MYWNowJiIVJLu1965vm4j6rd +XGWRHyZfhQ0BBf9mG5E98AoqOwvLneBT2x/e75ruWQKBgQD34aFrjcBSSqmCrV/7 +bYPSYzT3r+uNBg/S0mUWph2WUHBuelJi0owhHUMFoKrWoXhqm2gOzIeJoQU8XiKD +NcM9jTMkVyh7GyzJpLFV9SZKek1YRY2/3VS+Cpv2/sHRkDjFk1S3P2AZrsONqydQ +VB/Ybpsz0p00e8KtyaohzFg+mQKBgQDdgyHHB9c8FGkl7e/CHzN8VIBa94Ji+jog +jk6mGfW7lRgjjg1pHwjn9yQ4O2t9CDdUg6rBQ79l7J7MZAQLkGpXoraLJ2M09G3A +Xg6CO6FRN4yBtTE0/qik2teN4bbp2c6JCLzO125sBevP7wifsWHpJqNXJFQeyDbk +WRF2VhzzhwKBgF9eAXqduMZwTzMlfO4AvlytKm240wkYsfHMXHQQSQXRwM/gY939 +X0hGN8jsfY3B5dAuJiS7b9H1j0wgc2rDvm/p6SksFzj1xY92u3t0q9yvnR4+9EBC +6R2Me2DVtr/nms/41PkDevemkznoBWIUW4QrWa7gcvcEPmwaUEhck/7RAoGBAN0V +PicpujZqoK+MlRmIjphutlUUZ3xmBpHrtq+thUcdfaQu6U+b/AWY8vt0wsld4+tk +Jo8SEPuneK7CvA7WqmyhJ9QnEasOsmOm/JAa99zZtlDXCS+9Y5B2I2GmgCtSigLX +R6qh9cG2/y7fghnwrqpHOAuHZLX8Wlz6UKVtOSQNAoGBAMZzcZOk/vg4ciqaSZHk +q4VKTn9f6nS7VNZInYqOsA6rp/vuuy+NS1IS70MNYYCGYFVABdWEzApjQCv5aiTG +GLfJmOfwiplYcOA6ZlXQjGke4oPoqsI1SVYsPXLDZeRx1ikIbaGnSp+zo6LsgoHZ +vO0SdtcwimXjg3UmzzKZ0e6O +-----END PRIVATE KEY----- diff --git a/config/ca/private/client.key.pem b/config/ca/private/client.key.pem new file mode 100644 index 000000000..796c5b82f --- /dev/null +++ b/config/ca/private/client.key.pem @@ -0,0 +1,30 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQnr3dJPKOz5I0xqRv +1TQoOAICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEJdP550NeYnRPlur +LIuhAdkEggTQ0rcLralaA0Wu/gvFEEWnWX4U62+2caxgxnG0glAR3aykua96UxGD +R9+sTxw3vQNQi8O/bsR4vON8RypDhZnpNrhkeGmEcbF979OAq2552vX5OBfkm+TB +ka7TLGCHIyM9Zha2+GHnOOvNzhBJPkAGuDajT2CkBA7q3v/iHLNBUjDdK8cC79Fk +Ay2m2h9ji2ZwuhZNGtWZFTVkigAYXwlHqZHunFkSfgM+sr+PgjrXNshp5KwQcG8Q +r/4k3eXhEegsQnlUFFl75S7pI04Fp7CbmTkH685d2rr3QE+urC2s0bfR3Hyt8e0P +FEWcB++F75V43OVHsZWQ00LpqQ1kY0Tre2a/IetRjCdHcdjZDaDUuqovd6nKkKbE +B/trG7xebdjnWXIbSiIsbvu1ujItUQTRE67PscsKv8TNOcbSgIa7ItpQdRwY9rRd +W5elVK2BdAeFArJP3gs7E4OxgFHvnwTF9WUnPJMkHwqffaR4ndNVUhzQJqdniPxR +sfxaOfjQxI5eZYFY++b82IKHhHi0vL811+OhGkl93ueCdzSZoWlzRY85sEVi5d3m +VG1ESbBo057kbQPmVNiRyb3JGJKp2JZl+MIqIvky6bAhNkkPNfZgRvo9h30mQ8fa +82dGqg6uMZUaqSGVf7NBuFMSjAc97sQm21dhaLxyPm/5HGGCJ6aG6eoYRMvtgFr9 +Ji+aSvTgJF6B+e7QBQz5PWdohyYlVH195F/cO/hh36cHuGiUVDstL7bW9+8pfhqU +7zEsI5Ftz2cuBwa33ElLn3YoU9yZWCr+d6jbhlkNuZ4Hx6LzByvJbFdeRex+PtFa +62x1XLcIRusAl1FM7xFZOlA8lFWsyK8foyncZ7orBfBHpUtViqQri7YCM/ng/AEJ +SeTQhS793jgALx6nd4FDivMEp6mWZmW8EDUwC116Hxud8gFeeXHHf8XbAeYnm52k +pkEnWv8DXMxCYhxQSpvtRpjX3FQNW1ETdEFbGLMUjwjkKVnScDdSMqVeLylgcWZ1 +8l5UESrV1wSo8sh2v4vCGukJTHRvgMIyCOx166foqryVkCT2gDiuSlX0dTN6L/al +HEW4eIJFOF3ct0QOykZCnm/YEd/1o8/tDM/qAzMY23uN55crYJYncVh901I90PSA +Wp9KwM0wuJrniaQ8E3RXmBQNqbXrxpgV6Lar4l51y4mHRAhKHPu/c2BK0xWfuUJm +Fecyh/o/Gr0x5UJV3BF/JPTkJ/fQrzSqcdAYFqHU4zkzKlil6AKZgUcP7qY8F04L +lvfwjWaiV1btKASHZP72R9nnmNac0s/v2F8iP8Is4KlRLGgyiUsW970X9BFstvjB +1eayS+/oxou/Wf1NOW04Vl9vPBSqdEKv5mFk/ABTPfZRBGHLQPlY6ygp25/YRDFb +VPghIs2rk3icYGbSwZ80qGd3dkE9JHoUhZfHJyZF4oyyYrzHxWjFjexAwH76iX+G +lLlrcTIb9nowDhlHqtoRZBZoFnlZRdk0ISMEUnizZCtuGIgGz3Nbk1jPinW9BbhU +dRVBr7z4R8uH6ONYn15IbTx8keS6vm4wZLZ0yy8Jo8YZyOZf3pacOP8CtsU46+FR +fQkOXANYMaW5eEQni6TGypQjBd6XSb5LOZDUsyFid0yW2RaDpnkL8Ow= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/config/ca/private/localhost.decrypted.key.pem b/config/ca/private/localhost.decrypted.key.pem new file mode 100644 index 000000000..b5649ada8 --- /dev/null +++ b/config/ca/private/localhost.decrypted.key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCrZQuuIQG8EIwg +BCd59O/8YguYSkqn5xHG6skp9L3d6QlC23Iylwcez2Y95eq484PaayOQIxlrIwxg +lYBOqqbiTJmOk+MBmpaK4jWpgc5cZOKr2K3G9MStmiwOKDI4YIcF0OFANa31Uwby +JNQkjJjgoDDwu3PIEVwgxI56raQoEV/4YGxXlEH2mI9Y/nmhZW9WqRoVIusMAP58 +OWT3FOLNNv6xUcffftF66/crk07BTl3+wyM2lO7BjNqM7OPEMMoBUkjtMojsAUu9 +47kYuBXTmabH0b3cdU5i2soPZxFL62YyuJCOht7WqSPG7Mfo6FeEhQEuGXWTzW/W +IlX0u9j/AgMBAAECggEABDrqtmH/KnaYFsQzezmV4LtEwP34aLt1v1yVGXF+bCcv +wNQstd3vYY3J3rY5fFYaR35Ecu7C1leXmxylfYuNseElGxVAUY5Qr93UaDoZb0NY +KtietV3eKtC2zKSmVKjhPD4DCTQp9neVoM1S5RIJReX+PzrJKUNwbCidwZ5eglSd +HC59FnefqKjPgVJnAxqW9wG/ZebBe5zSy4Sfd+4YAvAwDxGkIowJcbLiNEGE/Its +dD2E9qDM5slEfMo9q5hvZMxZvLXziGJULx/i4peAfwZnIyrpSej5gWdsBjEtuqdj ++sj7wxpkZiBlfgkpt6fK2q+KYk/ribyDyKijft/HUQKBgQDTJrLLAB6Iyzr6BPmk +oZKDBPuue8kI4v6uvsGBkHYWquEZRVa/h4R+Nje6EUKbZsb8cwetk4r3FSXcK/e4 +gjxU5vFyYyzX8ZfKwRQl2BJ4mlCeBjlp4kwG8njmnzx14xFIh0KmibyrNlC4yK4Z +5UuSfyytS3tQ9YZNbKH3vYcAEQKBgQDPzJkXfxKgg4a1Cke6F7TXVUiyetwoNwvm +wPaVrrOyuhV7Lscq0QbAMwFUve4PiP63TThhbyoDIl10R616vAru7uUQ7kF6ewcM +vxMnjdInJqAis4BbcbEWUNG3gB6XUjNbwzTv8KpPZksGgMrJbGKGbdG1ezhSGIhC +Rp2LUf1YDwKBgQDMYCaqyqDDc0LQgURJj4JKguZBCtuZWG1/InAWQoeqhRd/6FeA +52Dc8Qmbdd1soVx1Obnyzl6xrayJoZ0S4CwZWbfWKhxboCJ2Q9CGmM+4IFVrv0aP +MFS6XLOdNf/Fc1VlSFbA74zIg7g6QzQRKJmvYJ0T132y7RNjmYRkUPR8oQKBgQC7 +GcyKdHdQIb0ry0rUCz5gWMDxO2B5sT69Eee01K2mcpie5nqcWcMLUaGULMNqJ365 +iwUF7fLVCZ898MAJ78CkbGPCP9SjNJ0fY/gaOD8N02CCfj9HlvHNVw3NfMWOmIv3 +xqcml/qxLTjGbTap8DYyNjWJg54thTtC+ZQm+rbzDwKBgQDJYiQ1pYyvPbBxHRWJ +QxrqABeYzpk/8D8hSPWoo5xXBVmVqj/ELCV/DPzGvjMCZlEa8f9sirXJStEifBnq +6eWqM7dF3p/w5BhyFYx5jfzyQSCmF+jKLDsRO0b1PVcIQrUp5xCAa+ruhE9se+p3 +3uB7Y0wg3NGKSExAFJTots6aHg== +-----END PRIVATE KEY----- diff --git a/config/ca/private/localhost.key.pem b/config/ca/private/localhost.key.pem new file mode 100644 index 000000000..7aa803aad --- /dev/null +++ b/config/ca/private/localhost.key.pem @@ -0,0 +1,30 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQzLzfNlYO97zexzbb +0O1pIwICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEECGJ8iwfjpyFpQB0 +CH0y2MIEggTQESoCq6AlMKVN4xVoD7rLlRI4xGkyI1+Eg0UQX0cWXNLl/b2BUD1l +zeo6EPdluuHunbaJ/Sx36ooJ/2uAsfzkBD35ACYz05nGnSA74SwJhHP1nvCzat9i +dZiuoGNNZHEhg17PLm43Gr2SvZrFL/ccRGhrOjSaVWeuC9Ut0XtFS2GinrwUHjhl +VrYvh8akZjcgFB9Q24KXYGh9tnTyainfHnyBhKpqjgPJE+N0JFStqHSDwgBk7tZe ++5BiPkBuGikhl4LGL29AVJR6RlainEjEFtI1ZWJu+5U+4pqIKp2vm12RyoC3RpjX +wzX51XGDK5v08I1Oa4LXv9Wl+JELUJupAg/guoXXyVHME1cCuupd6YhKLWtFbq0P +UdthoQtmgJU1Vs+au4VTuA1ZPcp4JE1XHg6v+Rbf4DlNLFhi/VAv7JLLptpo13KZ +WXFXMKUeTWV30Nu2Gs8NV4KpdlFVtGWb8vJTkVHgayI0XG1Cm/OkeZY8+oCs3lr5 +Kno4OxvAg/aEyNnBaustw44DDp4JFr15winMx3XMg2XPtmJJLVC9O/9KvOfbN6sb +LEo94/ZOwQjKCLGJMlA4q+kSp3mmfBkFppPCbas+zz5+qhOAkY03Q6+6qF9iIY4C +7HfEga0VYi7rMaqhjfcbPWdovtTTVBNqCgrB2gOjXQpXg1Aa6B5agQBlVRjt1zvo +wyVK3LzzmZLijC+WQ8V8cJZzc6FX49p+Z5RABuQDsUnS7SGaBF1vJ1SmRUrSuWMw +XnkkzbSiIFxvJQemZuhR7N0ShPyZev9zBNgSVg5t5IGrwUHsj91hYVocz/9wlmvy +AnNVltWpXKS0pU/DRtcYvYO5Pge4WDhdESxO1iHCzC8e1ZWi+oN5Lg25QYvVrWEz +gSMDAQnc/Pp31v80NbZiOWMMHBwpdp5/4xpZ+wn6PdK1qVQcHlXfkZkPKpIlmcqv +laQejx+iYYB4YFtKb7lf4vXm4GUG27Xmy2qLJuXC+DKss1s/t350khSubiTXmm8X +Npw5MnTee1lTqEKmvje+EkXteHCe/FPRfbFFffAqbNMUKSRx143z+CJmyrmyOFZm +5G7/LVpcmcU8pgPEp5mdOeMWiTuyN2gC91TuJIL8Jxbgbad7DnUJuiC2MLy3EJJI +7Uu3sL7DyoC71EZdjqsnWg2rBQgSYOhpVKq7ulNXbBUT1HYPwxWj+UAKOpD7Iokw +KGr4Uvd9N65SqBWWbXKZQgLIEu+fZLLzaF43A3u6VjilPUxHWLMgZ9O9WDprc0wB +Mvzo/yYVrtTycYSOCnUDByhbsHdC6rbko5hfulbUjJ5OyxQAE5GAomg0ep2C8t6t +suXLy94XUsMs6tMurQmCMXrnaomBH3jILUKfhJPhQ77OfiyVXjngakPRtNmOAegv +QWFlEY8VgEYT3L9ntCNEc40trmOxwkPtKo8m5RahVBoCSeH+Fzgsc/Nuby7rllHo +9iQSNUafqfx3+valSNfdByjFlbMuPT3QRCDhgiLdDtYeZUwuefaLXeCTU1G9cdM4 +XxkSrdhkdkK0TCaXek+Ldulb/OzzObpYGvZe11OwzQxuS+NP4oOUh3ErtZ5EqkU0 +JzChb/q6XHCXRdlM4E4LwSf0bN89ieHuXQkNy4AMw3cWuNRLhpeFTSE= +-----END ENCRYPTED PRIVATE KEY----- diff --git a/config/ca/serial b/config/ca/serial new file mode 100644 index 000000000..7d802a3e7 --- /dev/null +++ b/config/ca/serial @@ -0,0 +1 @@ +1002 diff --git a/config/ca/serial.old b/config/ca/serial.old new file mode 100644 index 000000000..dd1172404 --- /dev/null +++ b/config/ca/serial.old @@ -0,0 +1 @@ +1001 diff --git a/config/client-cert.jks b/config/client-cert.jks new file mode 100644 index 0000000000000000000000000000000000000000..f7dba32a0f91248b23d06716a56e760731a3103e GIT binary patch literal 2380 zcma)7do+}57oT_LouM(Vqfu%wNG{PkLvFcca*J>{8X=d)xHm*{DPlsCOB59%muV)M z+?P<1h)_rr6)FiMrCd^SIg_={ch2|M_x)Crhzu($>?ep4a7z_sIA7JAE zM80)B^HR7e42Fb53~&t+L7~-900^kU#Q^{b0~z3S7y73MuTTZIvKPC{XmxyxU$Ftf zJ*#a0a<)3T38lp*Qn&pw>aUainmWs_)%tiukkXSSk0mmKkzWM2vty61RmzwizbtoS9@ zCvVCyu}0SR!ZGWpox?+kz|Ap7S`kl?e9Cc0GDS0;Giue{ZrzbH48|4cChK#B!8=mNckR@of+GKt+~TBu_eI?m$5K zxZ(6=M1k*W;|?3%)Shh>c^x8}$klY%>Y7ncZB8F2r6_y+0r+G6Hdjc;%{XmVweYpc z+S?hwZ5lrc+bVjo*PFeMj8kSUMxXtv-BuibKAKVp%h`8S=pc&uYfV(N&i}9pF_hrQ z3nj!m8*UHQ&nUR6tun3WYF00^<3hQTl6_~{U`O>CdGCq(SF&WRZSCwIs@&n8v8bGE z!X=l%>2jM-qwTc3`Xg-(FWxJp6HesRu@Ykv?cS$etnBLVz0WyoEi?GXA-AQv7olD?-G z+!nOO=dAS2UnY&2?MX5sd)EdPF3#II*QU=+wC&}}JTbR#@ZKIMOBiOmRiPbOR{1po zK|Nm;!x~0?h8m^jzP%S>iGQo0if0&4t9Tr1532}jvhWC6YKWxW;=I+jo_fo8>zj9= zh;;AUhgXJp?#k)*pO-0NQH6F@uq~xlHXWFSuE*02yM$YMzLq#iQF1Qp|3v+JbX@LM+c?366tfe1O-@#Z|$d|?F!fI|Yt7Mq5`J_?G z1+KDQ+|FSFS?8D-y7x-8o>uiDhvVtxdWR5k5F5>Y5If4j9tkX}KVrbIucw)1(t|H34ofgiFQPM`Z(#CrSG%9?Uhy1yr2*;Ur#;7oZkKGPUem}` z#gUwI#W7Z8=Tr2<6)ETQ+i(GxkFFNY>;;?r(m1jihhh8annPL`E~j75czuVnDHfEB zD5x^UIJ>G}X5N6aH!lb;TDWtPiKyOGb)x`>9Oz#Azf_`X(LEb-LHfQx;Y!kB#5Y>~d|u%w5Y zYLJ=x#B;YRNt(H)Y_TWp4^n0CE((t{uv#sn-t{CGus~EWM$RSRQr+^#P((Uw?1A)P zFi?;`5J89mpD9GZ0XQ5k20+57O{z(jNlU^2AcTZLbfOTn359S1QCPUGEm4d=J^79x zM!<<4NDq#n|BVRzgUCa2zhlsttzjXd{&Zh;YEW>vxB5x1@Sqdw)L^=gzb{b=+Wb2P zfe|6^lOxkYPx$-zQ@u{mAQ>rPk~X9bX%V&e=#q3@_^uA5P5j%1{`_C{{6E=6`CV>g zM^S_PY4j5i1CalBqkn|R~Z$|+tTQ<|C;&9;`pjubp4`(Sow5p0!7nh81uG00UU@ZBTs6h8pl#5Dvj0anvTyBugOahbaJn zAOemogf#zwgh3^oqFo4$?&xSEXF;RWLiq%H%aJ#}{J%)Y^Vz_QfH+WcY2eEDi0H(q zy;u#!`gCug{u`8GFB>NxUcktZx+Y z4%&Ec2Z)0tQG)zck32UOIGZPj!P8X_8KlmsdWvt$CPDsubjWOl5 z@oG3P0>)_O(&`>^70YLAts?KFHC=RTD{R7Obb0utuZmf#)XE7UK9 zI(u$XBI+lLmQ~eIkfIoG>FhBoMe!P8+ZQORjduGba2fiBnO!qaS@EAjxu~Zl%+xP3 zaXr|4HH`hlfz4S3MROier~;nf_-z6uQfbTw?`%UBsGM{zJ#}VvrDU>Y#Z^*XqDuDY xR<)6WD9|A%D4eknVQ;9m@x^iKc) literal 0 HcmV?d00001 diff --git a/config/keystore.jks b/config/keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..1954cc72ca6480bdfe2ad962a1d5bb2c068c7978 GIT binary patch literal 1350 zcmV-M1-be#f(1eX0Ru3C1ndS0Duzgg_YDCD0ic2e-2{RJ*)W0x)i8nt(FO@BhDe6@ z4FLxRpn?R#FoFcW0s#Opf&{k)2`Yw2hW8Bt2LUi<1_>&LNQU+thDZTr0|Wso1P~~mBURD0HZSF0z(^og!1sWH1VE>0QGX+E%yTtpwN%gVhE>~s zfog3$wHN2JxQ$V>I`Lzh8+4k&hv_p9&}#NGKchFUWzwY>cnS3K$9@*nwrg=NTh#)$ zFr>8W;Dtm=J`nm=+mX1FUwdgZ&Dxm2_^D38z=AQ9&du&hGIMvaKCC9j(Nd(rG`2(! zI06S+c<}?GgX+ad{G{}w)l*oo=>rj*+vo@&Z?})vgwjHS>QjtRbiZiVyv9nbw*ke- zMHDdP8BzF%2js)unpA%e1AKCh*jR|vH9-2ZBF}d=h=F{$OWTYf++nY0JHNZ0($m~R zBpO4y^=CTQfrDI*Q1zvXN~O)K+%oGf3?y!H?_S>wp=z{#EtUey<7F52)e@1h3>y^A zdmTDk34n)x-fH4a{}x#qp0b9i zWsd6EqpP2kL2^WUiZ4dXT)cmUcumt}-gjm{bP5vRfWMaoQ9R)^Y%JdflK=~fAodeq zDo{=bzBw`3Y3TQlh7E(=e$vyk`cX^9s_$q1ry1mZIIb;xkTv1_HueAZXXQ9+;2Jn% zk2w$Lv`>8{mB8pakdwaRKapYe{t@|=?D}H1_lHI0r}8qHwQTAxg?4pYYsXT7oJtn4 z0}VO$jt^uL(Fy*z=S<-F4?mQcV#i?ubmx|mvFEG*JISaZC|R1U zs(;qZB|6(0E?j>yuW|DJua`1M-I~cIRj-VzL~kB%POo+xwB6;sJgAm`RXa$vjETUZ z(L*mNl>o;`YrD)`dc22?cu&N5R$GJ*@ua>iC!Fv5ZR_vGE|QN5obZ^u4JDbup3E%k z`s3i2tt_W{pPkgEd)8&&*k4g5B~GZFLpIGU_P*6%qO#oMcihrohhLp}EH`NS@%X`Ss=>v0~KNZlvb=sfp{H8I)bdq%3cJFWU|6TkALnEXoTMt&xl4?U?tEIxT(xR1kwdZfPqt(lu)KRwUN}%c$BRv#O_dlu>*4{yXD;_pRJK+Geb$y zUDcC%r~j0UHFzh{T_V6ZN_~%c_)?sphls$_p5HJ{FflL<1_@w>NC9O71OfpC00ba^ zHeK>HQ&K%z9N(PtH|$5MZt9MrgBSNt+NGM{EkpDK6lO@Rwd^false - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - spring-releases Spring Releases @@ -330,18 +322,10 @@ false - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - spring-releases Spring Releases - https://repo.spring.io/libs-release-local + https://repo.spring.io/release false diff --git a/spring-cloud-vault-config-aws/pom.xml b/spring-cloud-vault-config-aws/pom.xml index 37b9e40ad..0df8be9a3 100644 --- a/spring-cloud-vault-config-aws/pom.xml +++ b/spring-cloud-vault-config-aws/pom.xml @@ -38,12 +38,6 @@ - - org.junit.vintage - junit-vintage-engine - test - - io.netty netty-all diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/AwsSecretIntegrationTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/AwsSecretIntegrationTests.java index 1281d43d8..8004ffdf0 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/AwsSecretIntegrationTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/AwsSecretIntegrationTests.java @@ -33,7 +33,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.springframework.cloud.vault.config.aws.VaultConfigAwsBootstrapConfiguration.AwsSecretBackendMetadataFactory.forAws; /** diff --git a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java index 72a690383..81f41c260 100644 --- a/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java +++ b/spring-cloud-vault-config-aws/src/test/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsTests.java @@ -32,7 +32,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the aws secret backend. In case this test should fail because diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml index 2bf8a4d34..8d12a2a0f 100644 --- a/spring-cloud-vault-config-consul/pom.xml +++ b/spring-cloud-vault-config-consul/pom.xml @@ -40,12 +40,6 @@ - - org.junit.vintage - junit-vintage-engine - test - - org.apache.httpcomponents.client5 httpclient5 diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java index 101422d50..6f839fb61 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/ConsulSecretIntegrationTests.java @@ -32,7 +32,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests for {@link VaultConfigTemplate} using the consul secret backend. This diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/DiscoveryBootstrapConfigurationTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/DiscoveryBootstrapConfigurationTests.java index 5db96ad4c..818f0baff 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/DiscoveryBootstrapConfigurationTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/DiscoveryBootstrapConfigurationTests.java @@ -36,7 +36,7 @@ import org.springframework.vault.support.VaultHealth; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Tests for {@link DiscoveryBootstrapConfigurationTests}. diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/SetupConsul.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/SetupConsul.java index f19f85c04..5c6f47266 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/SetupConsul.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/SetupConsul.java @@ -30,7 +30,7 @@ import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.RestTemplate; -import static org.junit.Assume.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeFalse; /** * Utility to setup Consul. @@ -72,8 +72,8 @@ static void setupConsul(VaultOperations vaultOperations, String consulBackend) { } catch (HttpStatusCodeException e) { - assumeFalse("Skipping because Consul is not configured as we expect it to be", - e.getStatusCode().is4xxClientError()); + assumeFalse(e.getStatusCode().is4xxClientError(), + "Skipping because Consul is not configured as we expect it to be"); throw e; } diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java index b3a49b063..68c303df7 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulConfigDataTests.java @@ -38,7 +38,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Tests for {@link VaultConfigConsulConfigDataTests}. diff --git a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java index 39902a2bd..576750a32 100644 --- a/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java +++ b/spring-cloud-vault-config-consul/src/test/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulTests.java @@ -45,8 +45,8 @@ import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Java6Assertions.assertThat; -import static org.junit.Assume.assumeFalse; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the consul secret backend. In case this test should fail @@ -135,8 +135,8 @@ public static void beforeClass() { } catch (HttpStatusCodeException e) { - assumeFalse("Skipping because Consul is not configured as we expect it to be", - e.getStatusCode().is4xxClientError()); + assumeFalse(e.getStatusCode().is4xxClientError(), + "Skipping because Consul is not configured as we expect it to be"); throw e; } diff --git a/spring-cloud-vault-config-databases/pom.xml b/spring-cloud-vault-config-databases/pom.xml index 00b614504..cf1ec3871 100644 --- a/spring-cloud-vault-config-databases/pom.xml +++ b/spring-cloud-vault-config-databases/pom.xml @@ -36,12 +36,6 @@ - - org.junit.vintage - junit-vintage-engine - test - - org.apache.cassandra java-driver-core diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java index 1e83c1211..0c23723bb 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CassandraSecretIntegrationTests.java @@ -32,7 +32,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.forDatabase; /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CouchbaseSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CouchbaseSecretIntegrationTests.java index 2a19a35c3..6833877b5 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CouchbaseSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/CouchbaseSecretIntegrationTests.java @@ -33,7 +33,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.forDatabase; /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/ElasticsearchSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/ElasticsearchSecretIntegrationTests.java index b3c111cd9..df18af11e 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/ElasticsearchSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/ElasticsearchSecretIntegrationTests.java @@ -33,7 +33,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.forDatabase; /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java index 650e0a4de..6e3d734ec 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MongoSecretIntegrationTests.java @@ -34,7 +34,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.forDatabase; /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java index d520e6dff..f1ad7f0a6 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlDatabaseSecretIntegrationTests.java @@ -31,7 +31,7 @@ import org.springframework.cloud.vault.util.Version; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.forDatabase; /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java index 527bf5155..aed6b0101 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/MySqlSecretIntegrationTests.java @@ -32,7 +32,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.forDatabase; /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java index 88ffce09a..0395243d6 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/PostgreSqlSecretIntegrationTests.java @@ -32,7 +32,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.springframework.cloud.vault.config.databases.VaultConfigDatabaseBootstrapConfiguration.DatabaseSecretBackendMetadataFactory.forDatabase; /** diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java index 73b82d266..1b7438160 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCassandraTests.java @@ -34,7 +34,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the cassandra secret backend. In case this test should fail diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseDatabaseTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseDatabaseTests.java index af3cddb21..a0921cfbf 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseDatabaseTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseDatabaseTests.java @@ -36,7 +36,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the database secret backend. In case this test should fail diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseTests.java index d43598eb4..4100634f8 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigCouchbaseTests.java @@ -35,7 +35,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the couchbase secret backend. In case this test should fail diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java index 90861cdbc..ca104c08b 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMongoTests.java @@ -39,7 +39,7 @@ import org.springframework.cloud.vault.util.Version; import org.springframework.vault.core.VaultOperations; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the mongodb secret backend. In case this test should fail diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java index e3d01129c..f29ec8325 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java @@ -34,7 +34,7 @@ import org.springframework.cloud.vault.util.VaultRule; import org.springframework.cloud.vault.util.Version; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the database secret backend. In case this test should fail diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesBootstrapTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesBootstrapTests.java index 95c2e0e34..2271961f6 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesBootstrapTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesBootstrapTests.java @@ -37,7 +37,7 @@ import org.springframework.cloud.vault.util.Version; import org.springframework.vault.core.VaultOperations; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the database secret backend with multi-database support. In diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesTests.java index c3dea56b8..c24a6fae6 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabasesTests.java @@ -34,7 +34,7 @@ import org.springframework.cloud.vault.util.VaultRule; import org.springframework.cloud.vault.util.Version; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the database secret backend with multi-database support. In diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java index a1422df8a..0f514c28e 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java @@ -35,7 +35,7 @@ import org.springframework.cloud.vault.util.VaultRule; import org.springframework.vault.core.VaultOperations; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the mysql secret backend. In case this test should fail because diff --git a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java index 7b0bc84d7..199124d19 100644 --- a/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java +++ b/spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java @@ -37,7 +37,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the postgresql secret backend. In case this test should fail diff --git a/spring-cloud-vault-config-rabbitmq/pom.xml b/spring-cloud-vault-config-rabbitmq/pom.xml index 474ad96e5..d9a833155 100644 --- a/spring-cloud-vault-config-rabbitmq/pom.xml +++ b/spring-cloud-vault-config-rabbitmq/pom.xml @@ -38,12 +38,6 @@ - - org.junit.vintage - junit-vintage-engine - test - - org.apache.httpcomponents.client5 httpclient5 diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/RabbitMqSecretIntegrationTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/RabbitMqSecretIntegrationTests.java index 7ec36b66b..2ebed952d 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/RabbitMqSecretIntegrationTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/RabbitMqSecretIntegrationTests.java @@ -34,7 +34,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; import static org.springframework.cloud.vault.config.rabbitmq.VaultConfigRabbitMqBootstrapConfiguration.RabbitMqSecretBackendMetadataFactory.forRabbitMq; /** diff --git a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java index f0edcdd58..662d56d38 100644 --- a/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java +++ b/spring-cloud-vault-config-rabbitmq/src/test/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqTests.java @@ -37,7 +37,7 @@ import org.springframework.cloud.vault.util.Version; import org.springframework.vault.core.VaultOperations; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests using the rabbitmq secret backend. In case this test should fail diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index 3c32ab75c..d39de74ab 100644 --- a/spring-cloud-vault-config/pom.xml +++ b/spring-cloud-vault-config/pom.xml @@ -181,8 +181,9 @@ - org.junit.vintage - junit-vintage-engine + org.testcontainers + vault + 1.21.4 test diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java index 831024dac..f4c812f3f 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppRoleTests.java @@ -33,7 +33,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration test using config infrastructure with AppRole authentication. diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java index 8968f77cf..4b03440ac 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigCubbyholeAuthenticationTests.java @@ -34,7 +34,7 @@ import org.springframework.vault.support.VaultResponse; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration test using config infrastructure with Cubbyhole authentication. diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java index 41e22515d..adac31c6f 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java @@ -39,8 +39,8 @@ import org.springframework.vault.support.Policy.Rule; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; -import static org.springframework.cloud.vault.util.Settings.findWorkDir; +import static org.junit.jupiter.api.Assumptions.assumeTrue; +import static org.springframework.cloud.vault.util.Settings.findConfigDir; /** * Integration test using config infrastructure with Kubernetes authentication. @@ -81,7 +81,7 @@ public static void beforeClass() { vaultOperations.write("secret/" + VaultConfigKubernetesTests.class.getSimpleName(), Collections.singletonMap("vault.value", "foo")); - File workDir = findWorkDir(); + File workDir = findConfigDir(); String certificate = Files.contentOf(new File(workDir, "minikube/ca.crt"), StandardCharsets.US_ASCII); String host = String.format("https://%s:8443", minikubeIp); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTemplateIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTemplateIntegrationTests.java index a2f8c6ea7..f6dfdd51e 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTemplateIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTemplateIntegrationTests.java @@ -26,7 +26,7 @@ import org.springframework.cloud.vault.util.Version; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests for {@link VaultConfigTemplate}. diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java index c7033fe06..d1fe76a4b 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java @@ -48,9 +48,7 @@ * @author Mark Paluch */ @SpringBootTest(classes = VaultConfigTests.TestApplication.class, - properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80", - "spring.cloud.vault.uri=https://localhost:8200", "spring.cloud.vault.application-name=testVaultApp", - "spring.cloud.bootstrap.enabled=true" }) + properties = { "spring.cloud.vault.application-name=testVaultApp", "spring.cloud.bootstrap.enabled=true" }) public class VaultConfigTests { @Value("${vault.value}") @@ -67,6 +65,7 @@ public static void beforeClass() { VaultRule vaultRule = new VaultRule(); vaultRule.before(); + VaultRule.initializeSystemProperties(); Map object = new HashMap<>(); object.put("vault.value", "foo"); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java index 23d99d712..d5029466a 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java @@ -36,7 +36,7 @@ import org.springframework.vault.support.VaultMount; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.vault.util.Settings.findWorkDir; +import static org.springframework.cloud.vault.util.Settings.findConfigDir; /** * Integration test using config infrastructure with TLS certificate authentication. In @@ -82,7 +82,7 @@ public static void beforeClass() { vaultOperations.write("secret/" + VaultConfigTlsCertAuthenticationMountPathTests.class.getSimpleName(), Collections.singletonMap("vault.value", "foo")); - File workDir = findWorkDir(); + File workDir = findConfigDir(); String certificate = Files.contentOf(new File(workDir, "ca/certs/client.cert.pem"), StandardCharsets.US_ASCII); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java index ce6f53160..69313be05 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java @@ -35,7 +35,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.vault.util.Settings.findWorkDir; +import static org.springframework.cloud.vault.util.Settings.findConfigDir; /** * Integration test using config infrastructure with TLS certificate authentication. In @@ -82,7 +82,7 @@ public static void beforeClass() { vaultOperations.write("secret/" + VaultConfigTlsCertAuthenticationTests.class.getSimpleName(), Collections.singletonMap("vault.value", "foo")); - File workDir = findWorkDir(); + File workDir = findConfigDir(); String certificate = Files.contentOf(new File(workDir, "ca/certs/client.cert.pem"), StandardCharsets.US_ASCII); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultNamespaceTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultNamespaceTests.java index 6722f6ecd..51ff2d272 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultNamespaceTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultNamespaceTests.java @@ -22,8 +22,7 @@ import java.util.List; import java.util.Map; -import org.junit.Assume; -import org.junit.ClassRule; +import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; @@ -31,6 +30,7 @@ import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.Status; +import org.springframework.cloud.vault.util.PrepareVault; import org.springframework.cloud.vault.util.Settings; import org.springframework.cloud.vault.util.TestRestTemplateFactory; import org.springframework.cloud.vault.util.VaultRule; @@ -58,9 +58,6 @@ public class VaultNamespaceTests { - @ClassRule - public static VaultRule vaultRule = new VaultRule(); - static final Policy POLICY = Policy.of(Policy.Rule.builder() .path("/*") .capabilities(Policy.BuiltinCapabilities.READ, Policy.BuiltinCapabilities.CREATE, @@ -78,15 +75,15 @@ public class VaultNamespaceTests { @BeforeEach public void before() { - Assume.assumeTrue("Namespaces require enterprise version", - this.vaultRule.prepare().getVersion().isEnterprise()); + PrepareVault prepareVault = VaultRule.prepare(); + Assumptions.assumeTrue(prepareVault.getVersion().isEnterprise(), "Namespaces require enterprise version"); List namespaces = new ArrayList<>(Arrays.asList("dev/", "marketing/")); - List list = this.vaultRule.prepare().getVaultOperations().list("sys/namespaces"); + List list = prepareVault.getVaultOperations().list("sys/namespaces"); namespaces.removeAll(list); for (String namespace : namespaces) { - this.vaultRule.prepare().getVaultOperations().write("sys/namespaces/" + namespace.replaceAll("/", "")); + prepareVault.getVaultOperations().write("sys/namespaces/" + namespace.replaceAll("/", "")); } this.maketingRestTemplate = RestTemplateBuilder.builder() diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceIntegrationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceIntegrationTests.java index 85871c29b..6af6a7926 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceIntegrationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultPropertySourceIntegrationTests.java @@ -26,7 +26,7 @@ import org.springframework.cloud.vault.util.Version; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration tests for {@link VaultPropertySource}. diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java index d2d9718e0..e94c49692 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java @@ -37,7 +37,7 @@ import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * Integration test using config infrastructure with token authentication. diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java index 052b33afb..81ee1bcbf 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java @@ -35,7 +35,7 @@ public class Settings { */ public static VaultProperties createVaultProperties() { - File workDir = findWorkDir(); + File workDir = findConfigDir(); VaultProperties vaultProperties = new VaultProperties(); vaultProperties.getSsl().setTrustStorePassword("changeit"); @@ -50,36 +50,36 @@ public static VaultProperties createVaultProperties() { */ public static SslConfiguration createSslConfiguration() { - File workDir = findWorkDir(); + File workDir = findConfigDir(); return SslConfiguration.forTrustStore(new FileSystemResource(new File(workDir, "keystore.jks")), "changeit".toCharArray()); } /** - * Find the {@code work} directory, starting at the {@code user.dir} directory. Search - * is performed by walking the parent directories. - * @return the {@link File} pointing to the {@code work} directory - * @throws IllegalStateException If the {@code work} directory cannot be found. + * Find the {@code config} directory, starting at the {@code user.dir} directory. + * Search is performed by walking the parent directories. + * @return the {@link File} pointing to the {@code config} directory + * @throws IllegalStateException If the {@code config} directory cannot be found. */ - public static File findWorkDir() { - return findWorkDir(new File(System.getProperty("user.dir"))); + public static File findConfigDir() { + return findConfigDir(new File(System.getProperty("user.dir"))); } /** - * Find the {@code work} directory, starting at the given {@code directory}. Search is - * performed by walking the parent directories. - * @return the {@link File} pointing to the {@code work} directory - * @throws IllegalStateException If the {@code work} directory cannot be found. + * Find the {@code config} directory, starting at the given {@code directory}. Search + * is performed by walking the parent directories. + * @return the {@link File} pointing to the {@code config} directory + * @throws IllegalStateException If the {@code config} directory cannot be found. */ - public static File findWorkDir(File directory) { + public static File findConfigDir(File directory) { File searchLevel = directory; while (searchLevel.getParentFile() != null && searchLevel.getParentFile() != searchLevel) { - File work = new File(searchLevel, "work"); - if (work.isDirectory() && work.exists()) { - return work; + File file = new File(searchLevel, "config"); + if (file.isDirectory() && file.exists()) { + return file; } searchLevel = searchLevel.getParentFile(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java index 69b3d1015..cfaa15e29 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java @@ -16,13 +16,29 @@ package org.springframework.cloud.vault.util; +import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.HashMap; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.utility.MountableFile; +import org.testcontainers.vault.VaultContainer; + +import org.springframework.cloud.vault.config.VaultProperties; +import org.springframework.context.ApplicationContextInitializer; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.env.MapPropertySource; +import org.springframework.core.env.MutablePropertySources; +import org.springframework.core.io.FileSystemResource; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.util.Assert; import org.springframework.vault.authentication.SessionManager; @@ -31,13 +47,18 @@ import org.springframework.vault.support.SslConfiguration; import org.springframework.vault.support.VaultToken; -public class VaultRule implements BeforeEachCallback { +public class VaultRule implements BeforeEachCallback, + /* ParameterResolver, */ ApplicationContextInitializer { + + static final Logger logger = LoggerFactory.getLogger(VaultRule.class); public static final Version VERSIONING_INTRODUCED_WITH = Version.parse("0.10.0"); + public static final VaultContainer vaultContainer = createContainer(); + private final VaultEndpoint vaultEndpoint; - private final PrepareVault prepareVault; + private static PrepareVault prepareVault = null; private VaultToken token; @@ -48,7 +69,7 @@ public class VaultRule implements BeforeEachCallback { * @see VaultEndpoint */ public VaultRule() { - this(Settings.createSslConfiguration(), TestRestTemplateFactory.TEST_VAULT_ENDPOINT); + this(Settings.createSslConfiguration(), null); } /** @@ -60,15 +81,90 @@ public VaultRule() { public VaultRule(SslConfiguration sslConfiguration, VaultEndpoint vaultEndpoint) { Assert.notNull(sslConfiguration, "SslConfiguration must not be null"); - Assert.notNull(vaultEndpoint, "VaultEndpoint must not be null"); ClientHttpRequestFactory requestFactory = TestRestTemplateFactory.create(sslConfiguration).getRequestFactory(); - VaultTemplate vaultTemplate = new VaultTemplate(vaultEndpoint, requestFactory, new PreparingSessionManager()); + startVault(); + if (vaultEndpoint == null) { + this.vaultEndpoint = VaultEndpoint.create(vaultContainer.getHost(), vaultContainer.getMappedPort(8200)); + // this.vaultEndpoint.setScheme("http"); // ignore ssl for now + } + else { + this.vaultEndpoint = vaultEndpoint; + } + + VaultTemplate vaultTemplate = new VaultTemplate(this.vaultEndpoint, requestFactory, + new PreparingSessionManager()); this.token = Settings.token(); - this.prepareVault = new PrepareVault(vaultTemplate); - this.vaultEndpoint = vaultEndpoint; + prepareVault = new PrepareVault(vaultTemplate); + } + + public static PrepareVault prepare() { + return prepareVault; + } + + public static void startVault() { + if (vaultContainer != null && !vaultContainer.isRunning()) { + vaultContainer.start(); + } + } + + @SuppressWarnings({ "rawtypes" }) + public static VaultContainer createContainer() { + return createContainer("1.11.0"); + } + + @SuppressWarnings({ "unchecked", "rawtypes" }) + public static VaultContainer createContainer(String version) { + Path config = Settings.findConfigDir().toPath(); + String vaultConfig = null; + try { + vaultConfig = new FileSystemResource(config.resolve("vaultconfig.json")) + .getContentAsString(StandardCharsets.UTF_8); + vaultConfig = vaultConfig.replaceAll("\\n", ""); + } + catch (IOException e) { + throw new RuntimeException(e); + } + String dockerImageName = "hashicorp/vault:" + version; + VaultContainer container = (VaultContainer) new VaultContainer(dockerImageName) + // .withEnv("VAULT_LOG_LEVEL", "debug") + .withEnv("VAULT_LOCAL_CONFIG", vaultConfig) + .withCopyFileToContainer(MountableFile.forHostPath(config.resolve("ca/certs/localhost.cert.pem"), 0777), + "/tmp/localhost.cert.pem") + .withCopyFileToContainer( + MountableFile.forHostPath(config.resolve("ca/private/localhost.decrypted.key.pem"), 0777), + "/tmp/localhost.decrypted.key.pem") + .withCommand("server") + .withLogConsumer(new Slf4jLogConsumer(logger).withSeparateOutputStreams()); + // because of the tls setup, resetting wait to default for now + container.setWaitStrategy(Wait.defaultWaitStrategy()); + return container; + } + + public static void initializeSystemProperties() { + startVault(); + Integer mappedPort = vaultContainer.getMappedPort(8200); + + System.setProperty(VaultProperties.PREFIX + ".port", String.valueOf(mappedPort)); + System.setProperty(VaultProperties.PREFIX + ".host", vaultContainer.getHost()); + } + + @Override + public void initialize(ConfigurableApplicationContext context) { + startVault(); + + MutablePropertySources sources = context.getEnvironment().getPropertySources(); + + if (!sources.contains("vaultTestcontainer")) { + Integer mappedPort = vaultContainer.getMappedPort(8200); + HashMap map = new HashMap<>(); + map.put(VaultProperties.PREFIX + ".port", String.valueOf(mappedPort)); + map.put(VaultProperties.PREFIX + ".host", vaultContainer.getHost()); + + sources.addFirst(new MapPropertySource("vaultTestcontainer", map)); + } } @Override @@ -103,9 +199,15 @@ public void before() { } } - public PrepareVault prepare() { - return this.prepareVault; - } + /* + * @Override public boolean supportsParameter(ParameterContext parameterContext, + * ExtensionContext extensionContext) throws ParameterResolutionException { return + * parameterContext.getParameter().getType().equals(PrepareVault.class); } + * + * @Override public Object resolveParameter(ParameterContext parameterContext, + * ExtensionContext extensionContext) throws ParameterResolutionException { return + * this.prepareVault; } + */ private class PreparingSessionManager implements SessionManager { diff --git a/spring-cloud-vault-config/src/test/resources/logback-test.xml b/spring-cloud-vault-config/src/test/resources/logback-test.xml new file mode 100644 index 000000000..a42f8ffc6 --- /dev/null +++ b/spring-cloud-vault-config/src/test/resources/logback-test.xml @@ -0,0 +1,17 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n + + + + + + + + + + + + + \ No newline at end of file From aae5b9c5b948c987551485653f6df22380c83f9a Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 11 Jun 2026 14:17:15 -0400 Subject: [PATCH 2/4] Generates certificates using exec-maven-plugin --- config/ca/certs/ca.cert.pem | 23 ------- config/ca/certs/client.cert.pem | 24 ------- config/ca/certs/localhost.cert.pem | 27 -------- config/ca/client.p12 | Bin 2811 -> 0 bytes config/ca/csr/client.csr.pem | 17 ----- config/ca/csr/localhost.csr.pem | 18 ------ config/ca/index.txt | 2 - config/ca/index.txt.attr | 1 - config/ca/index.txt.attr.old | 1 - config/ca/index.txt.old | 1 - config/ca/newcerts/1000.pem | 27 -------- config/ca/newcerts/1001.pem | 24 ------- config/ca/private/ca.key.pem | 30 --------- config/ca/private/client.decrypted.key.pem | 28 --------- config/ca/private/client.key.pem | 30 --------- config/ca/private/localhost.decrypted.key.pem | 28 --------- config/ca/private/localhost.key.pem | 30 --------- config/ca/serial | 1 - config/ca/serial.old | 1 - config/client-cert.jks | Bin 2380 -> 0 bytes config/keystore.jks | Bin 1350 -> 0 bytes pom.xml | 19 ++++++ .../config/VaultConfigKubernetesTests.java | 4 +- ...igTlsCertAuthenticationMountPathTests.java | 4 +- ...VaultConfigTlsCertAuthenticationTests.java | 4 +- .../cloud/vault/util/Settings.java | 59 +++++++++++++----- .../cloud/vault/util/VaultRule.java | 5 +- 27 files changed, 72 insertions(+), 336 deletions(-) delete mode 100644 config/ca/certs/ca.cert.pem delete mode 100644 config/ca/certs/client.cert.pem delete mode 100644 config/ca/certs/localhost.cert.pem delete mode 100644 config/ca/client.p12 delete mode 100644 config/ca/csr/client.csr.pem delete mode 100644 config/ca/csr/localhost.csr.pem delete mode 100644 config/ca/index.txt delete mode 100644 config/ca/index.txt.attr delete mode 100644 config/ca/index.txt.attr.old delete mode 100644 config/ca/index.txt.old delete mode 100644 config/ca/newcerts/1000.pem delete mode 100644 config/ca/newcerts/1001.pem delete mode 100644 config/ca/private/ca.key.pem delete mode 100644 config/ca/private/client.decrypted.key.pem delete mode 100644 config/ca/private/client.key.pem delete mode 100644 config/ca/private/localhost.decrypted.key.pem delete mode 100644 config/ca/private/localhost.key.pem delete mode 100644 config/ca/serial delete mode 100644 config/ca/serial.old delete mode 100644 config/client-cert.jks delete mode 100644 config/keystore.jks diff --git a/config/ca/certs/ca.cert.pem b/config/ca/certs/ca.cert.pem deleted file mode 100644 index 04233f258..000000000 --- a/config/ca/certs/ca.cert.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDzTCCArWgAwIBAgIUdMU6u5VkfsEvQflFJdNkTAH4OgswDQYJKoZIhvcNAQEL -BQAwbjELMAkGA1UEBhMCTk4xEDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vu -a25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNV -BAMMDkNBIENlcnRpZmljYXRlMB4XDTI2MDYwNDE2NTgyOFoXDTQ2MDUzMDE2NTgy -OFowbjELMAkGA1UEBhMCTk4xEDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vu -a25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNV -BAMMDkNBIENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAkQ5xZX+5svDY0B5fJqm+PZDxdThRbRHJfwiR9zZHvXGlRDor585ScfRDwTQB -BHSM/Byf4vz03ondfdgGjthKp1ukepyhNNwDakzYaG0VfMb6vVOJlpf0M83GqKvX -NjMHnJX//vOc/cebXoAa8v6OdLUODzU4i4v+u3fZXlrKDD88nJLFPQfZ+2+PeJmy -/LPKpwhUBDzKtCnfXv8760a+PxKVbKjCvyW1Al4ZbjK4GNEeqqlycYLnNjEB4m1E -6bYF6ffW5+s5Sh+762qMAyWbvHWPmcIqMUjYiE/H74LRYK81jdmiE9NjGsSABAsM -ttXzp6/oLfIuWqTeHEHDzST23QIDAQABo2MwYTAdBgNVHQ4EFgQUdENb5YdJeMjE -xci1vAK4lPJ94uEwHwYDVR0jBBgwFoAUdENb5YdJeMjExci1vAK4lPJ94uEwDwYD -VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggEB -ADh/hapOD9fZ030itGWupSn93dwdokw7SNYao9UWAjZ5HXNdI0EEo1+ClxxMH5P7 -An8tcxjVZCmmwpa6C6E07kkEAudhzs7WxJ0jl9CUTKLnnG7GXl7hjDAGjCTeVtNp -32Ry9V1TN3kJTmc0k67EoPuMvUOpwTC3bsxlvHjgrL7DqoEz6eScBLDQ0xAgNFKd -e3I9TCnI42MdJziFbZrp5A+bB6/x3wPFjiA0Q7DsrkdZbbnwRFWICHYks0jIapi3 -5zrLQxbu3FqUVtJVBLGyTZBpZ3l8oImKCRCpKQuelSeRl1loRCFGWgM8IG777kSN -loJjNF6lkzJgegInVsYtw2s= ------END CERTIFICATE----- diff --git a/config/ca/certs/client.cert.pem b/config/ca/certs/client.cert.pem deleted file mode 100644 index cb0f4da73..000000000 --- a/config/ca/certs/client.cert.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEBDCCAuygAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwbjELMAkGA1UEBhMCTk4x -EDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNw -cmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNVBAMMDkNBIENlcnRpZmljYXRl -MB4XDTI2MDYwNDE2NTgyOFoXDTI3MDYxNDE2NTgyOFowVDELMAkGA1UEBhMCTk4x -EDAOBgNVBAgMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1j -b25maWcxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBANZ8wYRBM3xqsyCLCPp9DJsJhSq/ft4XR28gx8Jz84HBLP0nMnjbzRun -eAIWNDDXNqoT9yK3qOTrmK/UfYXI04zAAdEEUq6wBGCNaWQg83hgCXHtznH1qcvR -bMk97L8wZQcHiFKpdgpPpdgoIVkja8kFaKqjAcIurvNCzWmQ3HquxlKjbtITkVvB -R+WNP1wJ6eSyKIthBIgaY5R6pUsSRIMLqhp7JOoTjKDl7mX6lH2W+aGrAoAmpdjc -QM2QPDeNhQt33ZUsEthvW7o8wAWEJ8qkk1rgHXBDkWUTvqj8ULCcDbODgo4E5rNq -/SoO4RQKuPVSEK78RdiwHDTO/sSwPa8CAwEAAaOBxTCBwjAJBgNVHRMEAjAAMBEG -CWCGSAGG+EIBAQQEAwIFoDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0 -ZWQgQ2xpZW50IENlcnRpZmljYXRlMB0GA1UdDgQWBBT31Jb2d3qFeTsTLgRCJApI -oD1xojAfBgNVHSMEGDAWgBR0Q1vlh0l4yMTFyLW8AriU8n3i4TAOBgNVHQ8BAf8E -BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEB -CwUAA4IBAQBZ8eZeRiaQz30Db5g5MQVOyGEd0Tz3L9sAPYvKm/0bP0I6nJOxYSI/ -S9Gn5g3Hzp8ZytQtqv0HVY6yQuNmI2KC/aRYhIqaD31C6cXps6bVauJlRhotXyCv -+n9OSXi2jx3wLr//Hb1UL9LyyUEpawaQcH70BQBaxYRkd2cL0wsGg4fnEnn5o2WU -sbmfiySBSFhf3hdXYd2lUJ8kK97NaISrgjo9k8rszKOB63KrBsyoiIzuHoDOE50r -DFDmShWUn6HyX3kGn+lo5KwhV3gm4mYdWExDB7DnWKp7f/38qOfC/FsUIhKxH2IZ -K92f+pBhZgzz1K3V6ehW9Jq1DE6Nelu5 ------END CERTIFICATE----- diff --git a/config/ca/certs/localhost.cert.pem b/config/ca/certs/localhost.cert.pem deleted file mode 100644 index eeef5724c..000000000 --- a/config/ca/certs/localhost.cert.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEqDCCA5CgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwbjELMAkGA1UEBhMCTk4x -EDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNw -cmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNVBAMMDkNBIENlcnRpZmljYXRl -MB4XDTI2MDYwNDE2NTgyOFoXDTI3MDYxNDE2NTgyOFowVzELMAkGA1UEBhMCTk4x -EDAOBgNVBAgMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1j -b25maWcxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAKtlC64hAbwQjCAEJ3n07/xiC5hKSqfnEcbqySn0vd3pCULbcjKX -Bx7PZj3l6rjzg9prI5AjGWsjDGCVgE6qpuJMmY6T4wGaloriNamBzlxk4qvYrcb0 -xK2aLA4oMjhghwXQ4UA1rfVTBvIk1CSMmOCgMPC7c8gRXCDEjnqtpCgRX/hgbFeU -QfaYj1j+eaFlb1apGhUi6wwA/nw5ZPcU4s02/rFRx99+0Xrr9yuTTsFOXf7DIzaU -7sGM2ozs48QwygFSSO0yiOwBS73juRi4FdOZpsfRvdx1TmLayg9nEUvrZjK4kI6G -3tapI8bsx+joV4SFAS4ZdZPNb9YiVfS72P8CAwEAAaOCAWUwggFhMAkGA1UdEwQC -MAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdl -bmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFClBwTMMsc6O34Dx -5u0Keho5Gl9uMIGrBgNVHSMEgaMwgaCAFHRDW+WHSXjIxMXItbwCuJTyfeLhoXKk -cDBuMQswCQYDVQQGEwJOTjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UEBwwHVW5r -bm93bjEiMCAGA1UECgwZc3ByaW5nLWNsb3VkLXZhdWx0LWNvbmZpZzEXMBUGA1UE -AwwOQ0EgQ2VydGlmaWNhdGWCFHTFOruVZH7BL0H5RSXTZEwB+DoLMA4GA1UdDwEB -/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAaBgNVHREEEzARgglsb2NhbGhv -c3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBAErElDPyFnYxTSWlES8NkYxA4qKF -C9G+50d/Q7OXOQPuMYHGEBT3fb+w2kODa1er691Zjf6uWiDFtGMDZLISqVWUzoKr -pK8Erekph6bFmbaAjnv4j2zOJtVidPPsIeaS564L/LxLOPpxa98YrgrLLUpLCPcf -8mznJf4oLCvQkj6cCSW6qskaPDXQcbEu5dUn6vds2g/3UVjPmmrWZlCfOFvXTBiP -8RbuH5yKROpA9dZmRrOQMXpHsny7vAJ6DFzL5WU2m1eMzWDl/XNdVhQ8az98ppFc -eKt6CAxAc+frITdhzQdFqpPiksFU74Oeu5Tlc1m3NMA0lMpAyeTXqZKS64s= ------END CERTIFICATE----- diff --git a/config/ca/client.p12 b/config/ca/client.p12 deleted file mode 100644 index fd17a9fc5e43bb55d24f4d5040c545e6e288a082..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2811 zcmai$X*3iH8^;Y}>{+s8*VswTP?Tnrk#z`#5M@b}eKM9BVXVp6#=Z#m<$nK@)?CvzM4FD4A$1$-WC5zkA8rZF^6zOyTi_{x5n&?bTmnn)#&& zm4gX4{BGISGqWSq%szdh8cKX3Wj?E^07i=PuQ-_T^YW)7U?e#wV^s|O6}oW4YR70R z+Tj`tZKV0dvC(^mc45tsO3fe-RZgieG12Al9ShUxp^~yCwPwq<6oH@LsYn+_`iG&? zYTaDO(<&{q{JGwE0zR|CCb&ut`Or_g^;5$M43RZ*+dghKEv=>b;eq;oXIYRRPnhUe4^@ zvMWi`Eh@TOVyB3Ru6b~pEcC0FD^)$P;$FSrHxpmz+aFS=V#D#9i+~1x%up;|6sf;s_o*R*d*-@?Rwyu48+lSLu=`qkDh9?qWqRzIr)U- z=(wNS=U=xgkm-5#W+RvRO&u;AZta3b)z~m;q5OQC$2VWs6HhIeV4^#@mZp?Q!tG^W zfohJva`Q2i)dJqzIAr))v2qpSq}P_9`g@0RHk1BQT5(lzB(`s6J&{T0LScJ_PtU*$ zif<^2S^ks11CJ?S&9?7ikI3L*dQ+-}Ql6%Atscr=4epyjTIYx$@au0Ds&H@j?eaN0 z)B3z=_LD()n9c}!a&-KMzRwMLE3Q`>rW}Kbv-`)S39bgDr%7Acpn+-eeV!ll`)x1 z;zM4xld!AVIVZGwx(906(8bc#%6lb5iDk`z~1*5%b6?$ll7}N2rZ&KXSgXQ;_Lj4!)KHAlILa@wn ze?0b&7@32CSmvPL82x*EK^*^gCMP?9@ppOYH@xs)BAlxOososCPXjNmKP?Rd*Z-#o zA)Q!#GDktu?r9h?G5WG85DR>7Oa*t+_z>6fC@hYyX?rY;uYEYW7&4t&akB65_4Log z6}f=ZtbRodmnm1xZ`=B7F@Y3iG;PD1nK|pux!$T^*4xdx=|1Rznk8_uOBI7i52EsG zqj6%Rk%Pr(TE6~!4>MU9)Mi*#0+{zQRwp1~^gaq#Qt1lra*OZ6M6>jEZ3mgxZzXAT zHT-CzP^COPQEX$adx|$#E96Hjqt;UT$@2?yMOOb^a2`N9ckg1dRnDaRZ>vB^cC}9 z#0*2E_x#He|JAYS2!NIR-l>SvK84Yjbuh|EHh6xurojZ)f7X3}A*8^$V=z0yN-&ry z?-2X^M>sqcdchJJQrqeA_})ryh(YC~eD1Kd-g(q<)iV(&Oy!-lllv18I5!+&BRH-ir+koaV$VCT>yJn?)go+lT6&AdojGMvPnwHnH2NHVa-xMo z$P1j}tZjB%m+R2h*f&K~Sy(MP&z-*2yxk*owkr{>y6~WtNP_N%P1|>mgKWpWGBBq1C9|bCCC}nUwt%k;foLU8HK8h!Cbbp!-!umJ$pq7o&v+V39yH}8 zZK7dYrQd&*&Bt>vOo#}+N;`S#s)M(Bb=c4^Ie#SNrd&VNM~D!)?#$hKI=*=;E+Zda zws8)p4bXrLvEH*Od^xe*Uaylrsa{cf6pA1Il2>y(R{$!_uhw0~_lT*6cDjG0M5gzf zHsJz3p+U>NzO}nzKm2~1?(*Gtfr$g)ygI6^<%v}r-A0)+N-hcyU7@a(;Ff|3`E`kc zx#z|}a-iWkX9fS+yN4J2oYJ>wT>6u!@J<_yYwAGvE$OaVUR?KhXB{>9l0}V`;n|Fa zv)$^N>c3LHjSUcIf)~Wb%$H%esI%369!R9EHLUN@A9OegaUjZ2=m5UJ+1WHPFc(5fo-e# z`{fWg`qa_TB`|f0jlElMGmdBJIGSQ5S2V}d;%6JwP%XL}N04fONpUSX88uIvw?~D|?OK8>L2wNu(A%+krgzL|n$OvF&07_L-H{(ow zv2RhCLEDJJpZC*i4<>N`LlCEdzKWXXwd)*Yyv&^ANgf0X+-O`|!O diff --git a/config/ca/csr/client.csr.pem b/config/ca/csr/client.csr.pem deleted file mode 100644 index d1714e650..000000000 --- a/config/ca/csr/client.csr.pem +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICqzCCAZMCAQAwZjELMAkGA1UEBhMCTk4xEDAOBgNVBAgMB1Vua25vd24xEDAO -BgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1jb25m -aWcxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBANZ8wYRBM3xqsyCLCPp9DJsJhSq/ft4XR28gx8Jz84HBLP0nMnjbzRuneAIW -NDDXNqoT9yK3qOTrmK/UfYXI04zAAdEEUq6wBGCNaWQg83hgCXHtznH1qcvRbMk9 -7L8wZQcHiFKpdgpPpdgoIVkja8kFaKqjAcIurvNCzWmQ3HquxlKjbtITkVvBR+WN -P1wJ6eSyKIthBIgaY5R6pUsSRIMLqhp7JOoTjKDl7mX6lH2W+aGrAoAmpdjcQM2Q -PDeNhQt33ZUsEthvW7o8wAWEJ8qkk1rgHXBDkWUTvqj8ULCcDbODgo4E5rNq/SoO -4RQKuPVSEK78RdiwHDTO/sSwPa8CAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQAZ -idhPze8jR2e4AsTk0m6JXjG2CA4ZO/jfRjsVT5vnekn3wvuq/mG+ywKv8khn+CnZ -Zut6Cw63CrCfJkS64gQMrMznDsChwUXONmCIYY6mQ6AK7O/YwkhnMimI1jXrSWzJ -qS4YPjzfD8r5JwQCfX7rwxf+yPwYeWfv4K1HW3ECPjlctKtnBkYU3bP56AsO37MK -XU8zjXI0bsnF/NbjSA95jm61PouxSF8ILQCrPNm18I4slN8hqyKSxL27dkiv7Ym9 -4S/dQQPjJ51lVGD0lg4A1vACUwRi5ydxzdG/RO6lOIeHmfHTpqOf64DRIiBnbkLP -tlOD66pvSWAtbO4hKZXD ------END CERTIFICATE REQUEST----- diff --git a/config/ca/csr/localhost.csr.pem b/config/ca/csr/localhost.csr.pem deleted file mode 100644 index d1c8b8ad7..000000000 --- a/config/ca/csr/localhost.csr.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIIC2zCCAcMCAQAwaTELMAkGA1UEBhMCTk4xEDAOBgNVBAgMB1Vua25vd24xEDAO -BgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1jb25m -aWcxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBAKtlC64hAbwQjCAEJ3n07/xiC5hKSqfnEcbqySn0vd3pCULbcjKXBx7P -Zj3l6rjzg9prI5AjGWsjDGCVgE6qpuJMmY6T4wGaloriNamBzlxk4qvYrcb0xK2a -LA4oMjhghwXQ4UA1rfVTBvIk1CSMmOCgMPC7c8gRXCDEjnqtpCgRX/hgbFeUQfaY -j1j+eaFlb1apGhUi6wwA/nw5ZPcU4s02/rFRx99+0Xrr9yuTTsFOXf7DIzaU7sGM -2ozs48QwygFSSO0yiOwBS73juRi4FdOZpsfRvdx1TmLayg9nEUvrZjK4kI6G3tap -I8bsx+joV4SFAS4ZdZPNb9YiVfS72P8CAwEAAaAtMCsGCSqGSIb3DQEJDjEeMBww -GgYDVR0RBBMwEYIJbG9jYWxob3N0hwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQCP -fVeajKrN4/xJjMwwJDBP00vtM6NBL2/E8y6KXkzIDJ7C5hE10h4opMpSjL/24KH3 -JjvJhb62R3CaD3Sjq2jf/tKQiH05AUOHwCnXx4UFxSrQpQK5g5oNwOWCb2tBegkh -I+qCTLSOl2m9dRNyVCRFzmbquQBamQJsLGQVJzYbJmsZ+6crmDU6hOSFhdykriIf -iMajm3gHewjA6AviIFO8ww+AD+FJa/jek+dYNCpuryQmoEX2eDGjZvoRMTuA1nka -4Vrqoa8zOpputRXG1BqAShtO6R2fdC7izfCavBjroGaEqDyJuYCOH201wXdmluXN -v8W1R1A0HiuQj+9UbKfu ------END CERTIFICATE REQUEST----- diff --git a/config/ca/index.txt b/config/ca/index.txt deleted file mode 100644 index 148654d3b..000000000 --- a/config/ca/index.txt +++ /dev/null @@ -1,2 +0,0 @@ -V 270614165828Z 1000 unknown /C=NN/ST=Unknown/O=spring-cloud-vault-config/CN=localhost -V 270614165828Z 1001 unknown /C=NN/ST=Unknown/O=spring-cloud-vault-config/CN=client diff --git a/config/ca/index.txt.attr b/config/ca/index.txt.attr deleted file mode 100644 index 8f7e63a34..000000000 --- a/config/ca/index.txt.attr +++ /dev/null @@ -1 +0,0 @@ -unique_subject = yes diff --git a/config/ca/index.txt.attr.old b/config/ca/index.txt.attr.old deleted file mode 100644 index 8f7e63a34..000000000 --- a/config/ca/index.txt.attr.old +++ /dev/null @@ -1 +0,0 @@ -unique_subject = yes diff --git a/config/ca/index.txt.old b/config/ca/index.txt.old deleted file mode 100644 index bc41fdea8..000000000 --- a/config/ca/index.txt.old +++ /dev/null @@ -1 +0,0 @@ -V 270614165828Z 1000 unknown /C=NN/ST=Unknown/O=spring-cloud-vault-config/CN=localhost diff --git a/config/ca/newcerts/1000.pem b/config/ca/newcerts/1000.pem deleted file mode 100644 index eeef5724c..000000000 --- a/config/ca/newcerts/1000.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEqDCCA5CgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwbjELMAkGA1UEBhMCTk4x -EDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNw -cmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNVBAMMDkNBIENlcnRpZmljYXRl -MB4XDTI2MDYwNDE2NTgyOFoXDTI3MDYxNDE2NTgyOFowVzELMAkGA1UEBhMCTk4x -EDAOBgNVBAgMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1j -b25maWcxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAKtlC64hAbwQjCAEJ3n07/xiC5hKSqfnEcbqySn0vd3pCULbcjKX -Bx7PZj3l6rjzg9prI5AjGWsjDGCVgE6qpuJMmY6T4wGaloriNamBzlxk4qvYrcb0 -xK2aLA4oMjhghwXQ4UA1rfVTBvIk1CSMmOCgMPC7c8gRXCDEjnqtpCgRX/hgbFeU -QfaYj1j+eaFlb1apGhUi6wwA/nw5ZPcU4s02/rFRx99+0Xrr9yuTTsFOXf7DIzaU -7sGM2ozs48QwygFSSO0yiOwBS73juRi4FdOZpsfRvdx1TmLayg9nEUvrZjK4kI6G -3tapI8bsx+joV4SFAS4ZdZPNb9YiVfS72P8CAwEAAaOCAWUwggFhMAkGA1UdEwQC -MAAwEQYJYIZIAYb4QgEBBAQDAgZAMDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdl -bmVyYXRlZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFClBwTMMsc6O34Dx -5u0Keho5Gl9uMIGrBgNVHSMEgaMwgaCAFHRDW+WHSXjIxMXItbwCuJTyfeLhoXKk -cDBuMQswCQYDVQQGEwJOTjEQMA4GA1UECAwHVW5rbm93bjEQMA4GA1UEBwwHVW5r -bm93bjEiMCAGA1UECgwZc3ByaW5nLWNsb3VkLXZhdWx0LWNvbmZpZzEXMBUGA1UE -AwwOQ0EgQ2VydGlmaWNhdGWCFHTFOruVZH7BL0H5RSXTZEwB+DoLMA4GA1UdDwEB -/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAaBgNVHREEEzARgglsb2NhbGhv -c3SHBH8AAAEwDQYJKoZIhvcNAQELBQADggEBAErElDPyFnYxTSWlES8NkYxA4qKF -C9G+50d/Q7OXOQPuMYHGEBT3fb+w2kODa1er691Zjf6uWiDFtGMDZLISqVWUzoKr -pK8Erekph6bFmbaAjnv4j2zOJtVidPPsIeaS564L/LxLOPpxa98YrgrLLUpLCPcf -8mznJf4oLCvQkj6cCSW6qskaPDXQcbEu5dUn6vds2g/3UVjPmmrWZlCfOFvXTBiP -8RbuH5yKROpA9dZmRrOQMXpHsny7vAJ6DFzL5WU2m1eMzWDl/XNdVhQ8az98ppFc -eKt6CAxAc+frITdhzQdFqpPiksFU74Oeu5Tlc1m3NMA0lMpAyeTXqZKS64s= ------END CERTIFICATE----- diff --git a/config/ca/newcerts/1001.pem b/config/ca/newcerts/1001.pem deleted file mode 100644 index cb0f4da73..000000000 --- a/config/ca/newcerts/1001.pem +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEBDCCAuygAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwbjELMAkGA1UEBhMCTk4x -EDAOBgNVBAgMB1Vua25vd24xEDAOBgNVBAcMB1Vua25vd24xIjAgBgNVBAoMGXNw -cmluZy1jbG91ZC12YXVsdC1jb25maWcxFzAVBgNVBAMMDkNBIENlcnRpZmljYXRl -MB4XDTI2MDYwNDE2NTgyOFoXDTI3MDYxNDE2NTgyOFowVDELMAkGA1UEBhMCTk4x -EDAOBgNVBAgMB1Vua25vd24xIjAgBgNVBAoMGXNwcmluZy1jbG91ZC12YXVsdC1j -b25maWcxDzANBgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC -AQoCggEBANZ8wYRBM3xqsyCLCPp9DJsJhSq/ft4XR28gx8Jz84HBLP0nMnjbzRun -eAIWNDDXNqoT9yK3qOTrmK/UfYXI04zAAdEEUq6wBGCNaWQg83hgCXHtznH1qcvR -bMk97L8wZQcHiFKpdgpPpdgoIVkja8kFaKqjAcIurvNCzWmQ3HquxlKjbtITkVvB -R+WNP1wJ6eSyKIthBIgaY5R6pUsSRIMLqhp7JOoTjKDl7mX6lH2W+aGrAoAmpdjc -QM2QPDeNhQt33ZUsEthvW7o8wAWEJ8qkk1rgHXBDkWUTvqj8ULCcDbODgo4E5rNq -/SoO4RQKuPVSEK78RdiwHDTO/sSwPa8CAwEAAaOBxTCBwjAJBgNVHRMEAjAAMBEG -CWCGSAGG+EIBAQQEAwIFoDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0 -ZWQgQ2xpZW50IENlcnRpZmljYXRlMB0GA1UdDgQWBBT31Jb2d3qFeTsTLgRCJApI -oD1xojAfBgNVHSMEGDAWgBR0Q1vlh0l4yMTFyLW8AriU8n3i4TAOBgNVHQ8BAf8E -BAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMA0GCSqGSIb3DQEB -CwUAA4IBAQBZ8eZeRiaQz30Db5g5MQVOyGEd0Tz3L9sAPYvKm/0bP0I6nJOxYSI/ -S9Gn5g3Hzp8ZytQtqv0HVY6yQuNmI2KC/aRYhIqaD31C6cXps6bVauJlRhotXyCv -+n9OSXi2jx3wLr//Hb1UL9LyyUEpawaQcH70BQBaxYRkd2cL0wsGg4fnEnn5o2WU -sbmfiySBSFhf3hdXYd2lUJ8kK97NaISrgjo9k8rszKOB63KrBsyoiIzuHoDOE50r -DFDmShWUn6HyX3kGn+lo5KwhV3gm4mYdWExDB7DnWKp7f/38qOfC/FsUIhKxH2IZ -K92f+pBhZgzz1K3V6ehW9Jq1DE6Nelu5 ------END CERTIFICATE----- diff --git a/config/ca/private/ca.key.pem b/config/ca/private/ca.key.pem deleted file mode 100644 index 40ca2ffc8..000000000 --- a/config/ca/private/ca.key.pem +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN ENCRYPTED PRIVATE KEY----- -MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQfUVCLQdqKAsGDNAl -AUFtoQICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEND7NGH6uvK+KiG6 -jhZDK5MEggTQbzSpDqmUyh0AJLSbS9a70sSZTGS/uO4mESszO2ifiCatQreC0XdQ -jx0vqJHlFEgd9ZZVIKHIy5hI9sPoCGXoaICr33DywD+qgH18meL6AmNu6NZNlR/K -6SOtvUZib48bK/HYoU3psET7FFVd+QysWMnNmjgm6crE3KY77Mu5jDNKjIumDT20 -sS9L2MHZCwXIk+0EMe7yr6iCWcEScotL0DE6F/ImvDwiceL66uzxjfDcg7FP+jP8 -bACDb08NFAfUrlEPB4b78OAWQNZS4Xx/LjQYRLW3X7KHSneOmJEPbpsDxUpZpnYm -g8kVDvubODLpvORE3EEz429iDAmSHYjloG04j3ipvPhJSShD+PG7voGVPgnjhHDq -hoaJqLogPeZJ8TduyxoTWDZhAewpnlFfAqkJgX7bGlS27UnrKkmZJ7w2NtRoDuCJ -1oDs/CI5ky1H7vGx++BhfX+BHxUQ/siMJWYGl6EeMHUBuCGQSKVwm5XTSl2k1Usn -+eXvgtaiHGvg8fey+g7AQ6WKKXZyXsmLc19bR1Bgj+p3ga5F72a19DRd44X3bN6k -tTHzRgwz1BtkRJZoWBgXLhu2tU41HCU++8cUKOoItH71WvNB4F5v0fAxlfZXpTlT -yPe77e1JEeTuOfwi/NLu5uV/cdU5SVU/B5/nBSD/7S+l4oPt4Y0WHdyMFDxFwOKh -2wiis9kjI6i9S+05J7XmCvXT3W/c6yla/7PLwpgV69+4prPIaq6nooMQG3rkK/O+ -Bqp34O9OW+97UxzZu85e21cITL+4PuZpfUlbXetwUqz9mnNfpOMlvIwQp2FhhHiD -LbBaDMyssKR1thJayGEFiguM++fempf0G3lfFbplEaulV7hrGKIfXavH6R8if0QR -IFZbUwTVgSQMfAKNkBXnzV0tT8NGAuL56nWJzJERDrpjIe96aXeolECP2AO9i2uT -jAkYt0fcnJl+TrYMno+y6QdWd7D3i3rBsZjl+grqg5AJA2Cj0/WEHhvXsGZLWwMZ -9eLJuxVn9TcH5LnGu8NjChyI7Y4gOMBnj0rkhrb/h0WgG4HOymsiWSfHfyqMQ3mo -5423NM2nY/YmPSkv9pCamVGfKLJpO/7ndDclU55EYKNf1NxOF48LA00K2Kb2Ig2I -EwxDS9pbcUORqeEy/IpO9ElFuwYq1gh18/BYWNFLvYAJXBHBKu5DpD4TKAuhOyWV -/zmYogZsGPkUqHSHXmf4/h03pBg9afhohOh3KVdGuxfV7MEW7YUqUMYplHBXsNan -9NXM+z/SCrE7Oie6ZPZaYPNhgDSy8rjnbEMRdL95T/oMlibvrB1e7Cdy+5UNwjG2 -tIMvsbZe80/9kWnohYO/6D5mxlmOfn2EYcdBf67r8UJu0kdUKV0DwfyHVxLybUhF -RxVYnpldezWxxlQW6Xi2iVwe5djpzBYlQMHD/AExD78hiqDRB7+NUcAOOJ+KUYu9 -EXDF9RBNMpJL8BV1gbZNphsfQsfolexbgOl8O4bAYljxMxy7OGZCxe32EteJnMxs -TWQxdJsMxPbASoyp5R4BX27fsmPmfN4kyC8hbjOWtfaQyLoiYdMrRN4q2g4HWOuu -cpnbnal8S+3iIJAaffYy8RcnavIY6U0iF2XMU0Wpk/YEyHPapdNZxiU= ------END ENCRYPTED PRIVATE KEY----- diff --git a/config/ca/private/client.decrypted.key.pem b/config/ca/private/client.decrypted.key.pem deleted file mode 100644 index 366c391db..000000000 --- a/config/ca/private/client.decrypted.key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDWfMGEQTN8arMg -iwj6fQybCYUqv37eF0dvIMfCc/OBwSz9JzJ4280bp3gCFjQw1zaqE/cit6jk65iv -1H2FyNOMwAHRBFKusARgjWlkIPN4YAlx7c5x9anL0WzJPey/MGUHB4hSqXYKT6XY -KCFZI2vJBWiqowHCLq7zQs1pkNx6rsZSo27SE5FbwUfljT9cCenksiiLYQSIGmOU -eqVLEkSDC6oaeyTqE4yg5e5l+pR9lvmhqwKAJqXY3EDNkDw3jYULd92VLBLYb1u6 -PMAFhCfKpJNa4B1wQ5FlE76o/FCwnA2zg4KOBOazav0qDuEUCrj1UhCu/EXYsBw0 -zv7EsD2vAgMBAAECggEATVjQ6lIe8HuD3DT3SGlm7dPZj2heJlXrv0Hpd5Cb3Atf -H22OsHHHPfU+/DWonYJGpr+ra/wiLmddeO7eUyvwSf4FyavO60rzUSQ9wMt3MU4k -qc6Rl5v5HtSHb+ziXrHjhMztFq4gsKg3TMNv/zacTHIkZACDhlSSZ4wMCkkgkSaj -fYzS/BbWduu76qhSkwKdjfQhZ+IFYdLDW5Cb1GAK+s1HFWSCSZ5J7xTSse87h48H -lQewjJJ2qRp9b3QtBUkM9LaJnUQ6S2UfuZUT/y39MYWNowJiIVJLu1965vm4j6rd -XGWRHyZfhQ0BBf9mG5E98AoqOwvLneBT2x/e75ruWQKBgQD34aFrjcBSSqmCrV/7 -bYPSYzT3r+uNBg/S0mUWph2WUHBuelJi0owhHUMFoKrWoXhqm2gOzIeJoQU8XiKD -NcM9jTMkVyh7GyzJpLFV9SZKek1YRY2/3VS+Cpv2/sHRkDjFk1S3P2AZrsONqydQ -VB/Ybpsz0p00e8KtyaohzFg+mQKBgQDdgyHHB9c8FGkl7e/CHzN8VIBa94Ji+jog -jk6mGfW7lRgjjg1pHwjn9yQ4O2t9CDdUg6rBQ79l7J7MZAQLkGpXoraLJ2M09G3A -Xg6CO6FRN4yBtTE0/qik2teN4bbp2c6JCLzO125sBevP7wifsWHpJqNXJFQeyDbk -WRF2VhzzhwKBgF9eAXqduMZwTzMlfO4AvlytKm240wkYsfHMXHQQSQXRwM/gY939 -X0hGN8jsfY3B5dAuJiS7b9H1j0wgc2rDvm/p6SksFzj1xY92u3t0q9yvnR4+9EBC -6R2Me2DVtr/nms/41PkDevemkznoBWIUW4QrWa7gcvcEPmwaUEhck/7RAoGBAN0V -PicpujZqoK+MlRmIjphutlUUZ3xmBpHrtq+thUcdfaQu6U+b/AWY8vt0wsld4+tk -Jo8SEPuneK7CvA7WqmyhJ9QnEasOsmOm/JAa99zZtlDXCS+9Y5B2I2GmgCtSigLX -R6qh9cG2/y7fghnwrqpHOAuHZLX8Wlz6UKVtOSQNAoGBAMZzcZOk/vg4ciqaSZHk -q4VKTn9f6nS7VNZInYqOsA6rp/vuuy+NS1IS70MNYYCGYFVABdWEzApjQCv5aiTG -GLfJmOfwiplYcOA6ZlXQjGke4oPoqsI1SVYsPXLDZeRx1ikIbaGnSp+zo6LsgoHZ -vO0SdtcwimXjg3UmzzKZ0e6O ------END PRIVATE KEY----- diff --git a/config/ca/private/client.key.pem b/config/ca/private/client.key.pem deleted file mode 100644 index 796c5b82f..000000000 --- a/config/ca/private/client.key.pem +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN ENCRYPTED PRIVATE KEY----- -MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQnr3dJPKOz5I0xqRv -1TQoOAICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEJdP550NeYnRPlur -LIuhAdkEggTQ0rcLralaA0Wu/gvFEEWnWX4U62+2caxgxnG0glAR3aykua96UxGD -R9+sTxw3vQNQi8O/bsR4vON8RypDhZnpNrhkeGmEcbF979OAq2552vX5OBfkm+TB -ka7TLGCHIyM9Zha2+GHnOOvNzhBJPkAGuDajT2CkBA7q3v/iHLNBUjDdK8cC79Fk -Ay2m2h9ji2ZwuhZNGtWZFTVkigAYXwlHqZHunFkSfgM+sr+PgjrXNshp5KwQcG8Q -r/4k3eXhEegsQnlUFFl75S7pI04Fp7CbmTkH685d2rr3QE+urC2s0bfR3Hyt8e0P -FEWcB++F75V43OVHsZWQ00LpqQ1kY0Tre2a/IetRjCdHcdjZDaDUuqovd6nKkKbE -B/trG7xebdjnWXIbSiIsbvu1ujItUQTRE67PscsKv8TNOcbSgIa7ItpQdRwY9rRd -W5elVK2BdAeFArJP3gs7E4OxgFHvnwTF9WUnPJMkHwqffaR4ndNVUhzQJqdniPxR -sfxaOfjQxI5eZYFY++b82IKHhHi0vL811+OhGkl93ueCdzSZoWlzRY85sEVi5d3m -VG1ESbBo057kbQPmVNiRyb3JGJKp2JZl+MIqIvky6bAhNkkPNfZgRvo9h30mQ8fa -82dGqg6uMZUaqSGVf7NBuFMSjAc97sQm21dhaLxyPm/5HGGCJ6aG6eoYRMvtgFr9 -Ji+aSvTgJF6B+e7QBQz5PWdohyYlVH195F/cO/hh36cHuGiUVDstL7bW9+8pfhqU -7zEsI5Ftz2cuBwa33ElLn3YoU9yZWCr+d6jbhlkNuZ4Hx6LzByvJbFdeRex+PtFa -62x1XLcIRusAl1FM7xFZOlA8lFWsyK8foyncZ7orBfBHpUtViqQri7YCM/ng/AEJ -SeTQhS793jgALx6nd4FDivMEp6mWZmW8EDUwC116Hxud8gFeeXHHf8XbAeYnm52k -pkEnWv8DXMxCYhxQSpvtRpjX3FQNW1ETdEFbGLMUjwjkKVnScDdSMqVeLylgcWZ1 -8l5UESrV1wSo8sh2v4vCGukJTHRvgMIyCOx166foqryVkCT2gDiuSlX0dTN6L/al -HEW4eIJFOF3ct0QOykZCnm/YEd/1o8/tDM/qAzMY23uN55crYJYncVh901I90PSA -Wp9KwM0wuJrniaQ8E3RXmBQNqbXrxpgV6Lar4l51y4mHRAhKHPu/c2BK0xWfuUJm -Fecyh/o/Gr0x5UJV3BF/JPTkJ/fQrzSqcdAYFqHU4zkzKlil6AKZgUcP7qY8F04L -lvfwjWaiV1btKASHZP72R9nnmNac0s/v2F8iP8Is4KlRLGgyiUsW970X9BFstvjB -1eayS+/oxou/Wf1NOW04Vl9vPBSqdEKv5mFk/ABTPfZRBGHLQPlY6ygp25/YRDFb -VPghIs2rk3icYGbSwZ80qGd3dkE9JHoUhZfHJyZF4oyyYrzHxWjFjexAwH76iX+G -lLlrcTIb9nowDhlHqtoRZBZoFnlZRdk0ISMEUnizZCtuGIgGz3Nbk1jPinW9BbhU -dRVBr7z4R8uH6ONYn15IbTx8keS6vm4wZLZ0yy8Jo8YZyOZf3pacOP8CtsU46+FR -fQkOXANYMaW5eEQni6TGypQjBd6XSb5LOZDUsyFid0yW2RaDpnkL8Ow= ------END ENCRYPTED PRIVATE KEY----- diff --git a/config/ca/private/localhost.decrypted.key.pem b/config/ca/private/localhost.decrypted.key.pem deleted file mode 100644 index b5649ada8..000000000 --- a/config/ca/private/localhost.decrypted.key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCrZQuuIQG8EIwg -BCd59O/8YguYSkqn5xHG6skp9L3d6QlC23Iylwcez2Y95eq484PaayOQIxlrIwxg -lYBOqqbiTJmOk+MBmpaK4jWpgc5cZOKr2K3G9MStmiwOKDI4YIcF0OFANa31Uwby -JNQkjJjgoDDwu3PIEVwgxI56raQoEV/4YGxXlEH2mI9Y/nmhZW9WqRoVIusMAP58 -OWT3FOLNNv6xUcffftF66/crk07BTl3+wyM2lO7BjNqM7OPEMMoBUkjtMojsAUu9 -47kYuBXTmabH0b3cdU5i2soPZxFL62YyuJCOht7WqSPG7Mfo6FeEhQEuGXWTzW/W -IlX0u9j/AgMBAAECggEABDrqtmH/KnaYFsQzezmV4LtEwP34aLt1v1yVGXF+bCcv -wNQstd3vYY3J3rY5fFYaR35Ecu7C1leXmxylfYuNseElGxVAUY5Qr93UaDoZb0NY -KtietV3eKtC2zKSmVKjhPD4DCTQp9neVoM1S5RIJReX+PzrJKUNwbCidwZ5eglSd -HC59FnefqKjPgVJnAxqW9wG/ZebBe5zSy4Sfd+4YAvAwDxGkIowJcbLiNEGE/Its -dD2E9qDM5slEfMo9q5hvZMxZvLXziGJULx/i4peAfwZnIyrpSej5gWdsBjEtuqdj -+sj7wxpkZiBlfgkpt6fK2q+KYk/ribyDyKijft/HUQKBgQDTJrLLAB6Iyzr6BPmk -oZKDBPuue8kI4v6uvsGBkHYWquEZRVa/h4R+Nje6EUKbZsb8cwetk4r3FSXcK/e4 -gjxU5vFyYyzX8ZfKwRQl2BJ4mlCeBjlp4kwG8njmnzx14xFIh0KmibyrNlC4yK4Z -5UuSfyytS3tQ9YZNbKH3vYcAEQKBgQDPzJkXfxKgg4a1Cke6F7TXVUiyetwoNwvm -wPaVrrOyuhV7Lscq0QbAMwFUve4PiP63TThhbyoDIl10R616vAru7uUQ7kF6ewcM -vxMnjdInJqAis4BbcbEWUNG3gB6XUjNbwzTv8KpPZksGgMrJbGKGbdG1ezhSGIhC -Rp2LUf1YDwKBgQDMYCaqyqDDc0LQgURJj4JKguZBCtuZWG1/InAWQoeqhRd/6FeA -52Dc8Qmbdd1soVx1Obnyzl6xrayJoZ0S4CwZWbfWKhxboCJ2Q9CGmM+4IFVrv0aP -MFS6XLOdNf/Fc1VlSFbA74zIg7g6QzQRKJmvYJ0T132y7RNjmYRkUPR8oQKBgQC7 -GcyKdHdQIb0ry0rUCz5gWMDxO2B5sT69Eee01K2mcpie5nqcWcMLUaGULMNqJ365 -iwUF7fLVCZ898MAJ78CkbGPCP9SjNJ0fY/gaOD8N02CCfj9HlvHNVw3NfMWOmIv3 -xqcml/qxLTjGbTap8DYyNjWJg54thTtC+ZQm+rbzDwKBgQDJYiQ1pYyvPbBxHRWJ -QxrqABeYzpk/8D8hSPWoo5xXBVmVqj/ELCV/DPzGvjMCZlEa8f9sirXJStEifBnq -6eWqM7dF3p/w5BhyFYx5jfzyQSCmF+jKLDsRO0b1PVcIQrUp5xCAa+ruhE9se+p3 -3uB7Y0wg3NGKSExAFJTots6aHg== ------END PRIVATE KEY----- diff --git a/config/ca/private/localhost.key.pem b/config/ca/private/localhost.key.pem deleted file mode 100644 index 7aa803aad..000000000 --- a/config/ca/private/localhost.key.pem +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN ENCRYPTED PRIVATE KEY----- -MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQzLzfNlYO97zexzbb -0O1pIwICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEECGJ8iwfjpyFpQB0 -CH0y2MIEggTQESoCq6AlMKVN4xVoD7rLlRI4xGkyI1+Eg0UQX0cWXNLl/b2BUD1l -zeo6EPdluuHunbaJ/Sx36ooJ/2uAsfzkBD35ACYz05nGnSA74SwJhHP1nvCzat9i -dZiuoGNNZHEhg17PLm43Gr2SvZrFL/ccRGhrOjSaVWeuC9Ut0XtFS2GinrwUHjhl -VrYvh8akZjcgFB9Q24KXYGh9tnTyainfHnyBhKpqjgPJE+N0JFStqHSDwgBk7tZe -+5BiPkBuGikhl4LGL29AVJR6RlainEjEFtI1ZWJu+5U+4pqIKp2vm12RyoC3RpjX -wzX51XGDK5v08I1Oa4LXv9Wl+JELUJupAg/guoXXyVHME1cCuupd6YhKLWtFbq0P -UdthoQtmgJU1Vs+au4VTuA1ZPcp4JE1XHg6v+Rbf4DlNLFhi/VAv7JLLptpo13KZ -WXFXMKUeTWV30Nu2Gs8NV4KpdlFVtGWb8vJTkVHgayI0XG1Cm/OkeZY8+oCs3lr5 -Kno4OxvAg/aEyNnBaustw44DDp4JFr15winMx3XMg2XPtmJJLVC9O/9KvOfbN6sb -LEo94/ZOwQjKCLGJMlA4q+kSp3mmfBkFppPCbas+zz5+qhOAkY03Q6+6qF9iIY4C -7HfEga0VYi7rMaqhjfcbPWdovtTTVBNqCgrB2gOjXQpXg1Aa6B5agQBlVRjt1zvo -wyVK3LzzmZLijC+WQ8V8cJZzc6FX49p+Z5RABuQDsUnS7SGaBF1vJ1SmRUrSuWMw -XnkkzbSiIFxvJQemZuhR7N0ShPyZev9zBNgSVg5t5IGrwUHsj91hYVocz/9wlmvy -AnNVltWpXKS0pU/DRtcYvYO5Pge4WDhdESxO1iHCzC8e1ZWi+oN5Lg25QYvVrWEz -gSMDAQnc/Pp31v80NbZiOWMMHBwpdp5/4xpZ+wn6PdK1qVQcHlXfkZkPKpIlmcqv -laQejx+iYYB4YFtKb7lf4vXm4GUG27Xmy2qLJuXC+DKss1s/t350khSubiTXmm8X -Npw5MnTee1lTqEKmvje+EkXteHCe/FPRfbFFffAqbNMUKSRx143z+CJmyrmyOFZm -5G7/LVpcmcU8pgPEp5mdOeMWiTuyN2gC91TuJIL8Jxbgbad7DnUJuiC2MLy3EJJI -7Uu3sL7DyoC71EZdjqsnWg2rBQgSYOhpVKq7ulNXbBUT1HYPwxWj+UAKOpD7Iokw -KGr4Uvd9N65SqBWWbXKZQgLIEu+fZLLzaF43A3u6VjilPUxHWLMgZ9O9WDprc0wB -Mvzo/yYVrtTycYSOCnUDByhbsHdC6rbko5hfulbUjJ5OyxQAE5GAomg0ep2C8t6t -suXLy94XUsMs6tMurQmCMXrnaomBH3jILUKfhJPhQ77OfiyVXjngakPRtNmOAegv -QWFlEY8VgEYT3L9ntCNEc40trmOxwkPtKo8m5RahVBoCSeH+Fzgsc/Nuby7rllHo -9iQSNUafqfx3+valSNfdByjFlbMuPT3QRCDhgiLdDtYeZUwuefaLXeCTU1G9cdM4 -XxkSrdhkdkK0TCaXek+Ldulb/OzzObpYGvZe11OwzQxuS+NP4oOUh3ErtZ5EqkU0 -JzChb/q6XHCXRdlM4E4LwSf0bN89ieHuXQkNy4AMw3cWuNRLhpeFTSE= ------END ENCRYPTED PRIVATE KEY----- diff --git a/config/ca/serial b/config/ca/serial deleted file mode 100644 index 7d802a3e7..000000000 --- a/config/ca/serial +++ /dev/null @@ -1 +0,0 @@ -1002 diff --git a/config/ca/serial.old b/config/ca/serial.old deleted file mode 100644 index dd1172404..000000000 --- a/config/ca/serial.old +++ /dev/null @@ -1 +0,0 @@ -1001 diff --git a/config/client-cert.jks b/config/client-cert.jks deleted file mode 100644 index f7dba32a0f91248b23d06716a56e760731a3103e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2380 zcma)7do+}57oT_LouM(Vqfu%wNG{PkLvFcca*J>{8X=d)xHm*{DPlsCOB59%muV)M z+?P<1h)_rr6)FiMrCd^SIg_={ch2|M_x)Crhzu($>?ep4a7z_sIA7JAE zM80)B^HR7e42Fb53~&t+L7~-900^kU#Q^{b0~z3S7y73MuTTZIvKPC{XmxyxU$Ftf zJ*#a0a<)3T38lp*Qn&pw>aUainmWs_)%tiukkXSSk0mmKkzWM2vty61RmzwizbtoS9@ zCvVCyu}0SR!ZGWpox?+kz|Ap7S`kl?e9Cc0GDS0;Giue{ZrzbH48|4cChK#B!8=mNckR@of+GKt+~TBu_eI?m$5K zxZ(6=M1k*W;|?3%)Shh>c^x8}$klY%>Y7ncZB8F2r6_y+0r+G6Hdjc;%{XmVweYpc z+S?hwZ5lrc+bVjo*PFeMj8kSUMxXtv-BuibKAKVp%h`8S=pc&uYfV(N&i}9pF_hrQ z3nj!m8*UHQ&nUR6tun3WYF00^<3hQTl6_~{U`O>CdGCq(SF&WRZSCwIs@&n8v8bGE z!X=l%>2jM-qwTc3`Xg-(FWxJp6HesRu@Ykv?cS$etnBLVz0WyoEi?GXA-AQv7olD?-G z+!nOO=dAS2UnY&2?MX5sd)EdPF3#II*QU=+wC&}}JTbR#@ZKIMOBiOmRiPbOR{1po zK|Nm;!x~0?h8m^jzP%S>iGQo0if0&4t9Tr1532}jvhWC6YKWxW;=I+jo_fo8>zj9= zh;;AUhgXJp?#k)*pO-0NQH6F@uq~xlHXWFSuE*02yM$YMzLq#iQF1Qp|3v+JbX@LM+c?366tfe1O-@#Z|$d|?F!fI|Yt7Mq5`J_?G z1+KDQ+|FSFS?8D-y7x-8o>uiDhvVtxdWR5k5F5>Y5If4j9tkX}KVrbIucw)1(t|H34ofgiFQPM`Z(#CrSG%9?Uhy1yr2*;Ur#;7oZkKGPUem}` z#gUwI#W7Z8=Tr2<6)ETQ+i(GxkFFNY>;;?r(m1jihhh8annPL`E~j75czuVnDHfEB zD5x^UIJ>G}X5N6aH!lb;TDWtPiKyOGb)x`>9Oz#Azf_`X(LEb-LHfQx;Y!kB#5Y>~d|u%w5Y zYLJ=x#B;YRNt(H)Y_TWp4^n0CE((t{uv#sn-t{CGus~EWM$RSRQr+^#P((Uw?1A)P zFi?;`5J89mpD9GZ0XQ5k20+57O{z(jNlU^2AcTZLbfOTn359S1QCPUGEm4d=J^79x zM!<<4NDq#n|BVRzgUCa2zhlsttzjXd{&Zh;YEW>vxB5x1@Sqdw)L^=gzb{b=+Wb2P zfe|6^lOxkYPx$-zQ@u{mAQ>rPk~X9bX%V&e=#q3@_^uA5P5j%1{`_C{{6E=6`CV>g zM^S_PY4j5i1CalBqkn|R~Z$|+tTQ<|C;&9;`pjubp4`(Sow5p0!7nh81uG00UU@ZBTs6h8pl#5Dvj0anvTyBugOahbaJn zAOemogf#zwgh3^oqFo4$?&xSEXF;RWLiq%H%aJ#}{J%)Y^Vz_QfH+WcY2eEDi0H(q zy;u#!`gCug{u`8GFB>NxUcktZx+Y z4%&Ec2Z)0tQG)zck32UOIGZPj!P8X_8KlmsdWvt$CPDsubjWOl5 z@oG3P0>)_O(&`>^70YLAts?KFHC=RTD{R7Obb0utuZmf#)XE7UK9 zI(u$XBI+lLmQ~eIkfIoG>FhBoMe!P8+ZQORjduGba2fiBnO!qaS@EAjxu~Zl%+xP3 zaXr|4HH`hlfz4S3MROier~;nf_-z6uQfbTw?`%UBsGM{zJ#}VvrDU>Y#Z^*XqDuDY xR<)6WD9|A%D4eknVQ;9m@x^iKc) diff --git a/config/keystore.jks b/config/keystore.jks deleted file mode 100644 index 1954cc72ca6480bdfe2ad962a1d5bb2c068c7978..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1350 zcmV-M1-be#f(1eX0Ru3C1ndS0Duzgg_YDCD0ic2e-2{RJ*)W0x)i8nt(FO@BhDe6@ z4FLxRpn?R#FoFcW0s#Opf&{k)2`Yw2hW8Bt2LUi<1_>&LNQU+thDZTr0|Wso1P~~mBURD0HZSF0z(^og!1sWH1VE>0QGX+E%yTtpwN%gVhE>~s zfog3$wHN2JxQ$V>I`Lzh8+4k&hv_p9&}#NGKchFUWzwY>cnS3K$9@*nwrg=NTh#)$ zFr>8W;Dtm=J`nm=+mX1FUwdgZ&Dxm2_^D38z=AQ9&du&hGIMvaKCC9j(Nd(rG`2(! zI06S+c<}?GgX+ad{G{}w)l*oo=>rj*+vo@&Z?})vgwjHS>QjtRbiZiVyv9nbw*ke- zMHDdP8BzF%2js)unpA%e1AKCh*jR|vH9-2ZBF}d=h=F{$OWTYf++nY0JHNZ0($m~R zBpO4y^=CTQfrDI*Q1zvXN~O)K+%oGf3?y!H?_S>wp=z{#EtUey<7F52)e@1h3>y^A zdmTDk34n)x-fH4a{}x#qp0b9i zWsd6EqpP2kL2^WUiZ4dXT)cmUcumt}-gjm{bP5vRfWMaoQ9R)^Y%JdflK=~fAodeq zDo{=bzBw`3Y3TQlh7E(=e$vyk`cX^9s_$q1ry1mZIIb;xkTv1_HueAZXXQ9+;2Jn% zk2w$Lv`>8{mB8pakdwaRKapYe{t@|=?D}H1_lHI0r}8qHwQTAxg?4pYYsXT7oJtn4 z0}VO$jt^uL(Fy*z=S<-F4?mQcV#i?ubmx|mvFEG*JISaZC|R1U zs(;qZB|6(0E?j>yuW|DJua`1M-I~cIRj-VzL~kB%POo+xwB6;sJgAm`RXa$vjETUZ z(L*mNl>o;`YrD)`dc22?cu&N5R$GJ*@ua>iC!Fv5ZR_vGE|QN5obZ^u4JDbup3E%k z`s3i2tt_W{pPkgEd)8&&*k4g5B~GZFLpIGU_P*6%qO#oMcihrohhLp}EH`NS@%X`Ss=>v0~KNZlvb=sfp{H8I)bdq%3cJFWU|6TkALnEXoTMt&xl4?U?tEIxT(xR1kwdZfPqt(lu)KRwUN}%c$BRv#O_dlu>*4{yXD;_pRJK+Geb$y zUDcC%r~j0UHFzh{T_V6ZN_~%c_)?sphls$_p5HJ{FflL<1_@w>NC9O71OfpC00ba^ zHeK>HQ&K%z9N(PtH|$5MZt9MrgBSNt+NGM{EkpDK6lO@Rwd^org.apache.maven.plugins maven-checkstyle-plugin + + org.codehaus.mojo + exec-maven-plugin + 3.6.3 + + + generate-certificates + generate-sources + + ./src/test/bash/create_certificates.sh + + + exec + + + false + + + diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java index adac31c6f..4c8b0f026 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigKubernetesTests.java @@ -40,7 +40,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assumptions.assumeTrue; -import static org.springframework.cloud.vault.util.Settings.findConfigDir; +import static org.springframework.cloud.vault.util.Settings.findWorkDir; /** * Integration test using config infrastructure with Kubernetes authentication. @@ -81,7 +81,7 @@ public static void beforeClass() { vaultOperations.write("secret/" + VaultConfigKubernetesTests.class.getSimpleName(), Collections.singletonMap("vault.value", "foo")); - File workDir = findConfigDir(); + File workDir = findWorkDir(); String certificate = Files.contentOf(new File(workDir, "minikube/ca.crt"), StandardCharsets.US_ASCII); String host = String.format("https://%s:8443", minikubeIp); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java index d5029466a..23d99d712 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java @@ -36,7 +36,7 @@ import org.springframework.vault.support.VaultMount; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.vault.util.Settings.findConfigDir; +import static org.springframework.cloud.vault.util.Settings.findWorkDir; /** * Integration test using config infrastructure with TLS certificate authentication. In @@ -82,7 +82,7 @@ public static void beforeClass() { vaultOperations.write("secret/" + VaultConfigTlsCertAuthenticationMountPathTests.class.getSimpleName(), Collections.singletonMap("vault.value", "foo")); - File workDir = findConfigDir(); + File workDir = findWorkDir(); String certificate = Files.contentOf(new File(workDir, "ca/certs/client.cert.pem"), StandardCharsets.US_ASCII); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java index 69313be05..ce6f53160 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java @@ -35,7 +35,7 @@ import org.springframework.vault.core.VaultOperations; import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.cloud.vault.util.Settings.findConfigDir; +import static org.springframework.cloud.vault.util.Settings.findWorkDir; /** * Integration test using config infrastructure with TLS certificate authentication. In @@ -82,7 +82,7 @@ public static void beforeClass() { vaultOperations.write("secret/" + VaultConfigTlsCertAuthenticationTests.class.getSimpleName(), Collections.singletonMap("vault.value", "foo")); - File workDir = findConfigDir(); + File workDir = findWorkDir(); String certificate = Files.contentOf(new File(workDir, "ca/certs/client.cert.pem"), StandardCharsets.US_ASCII); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java index 81ee1bcbf..fd3937034 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java @@ -35,7 +35,7 @@ public class Settings { */ public static VaultProperties createVaultProperties() { - File workDir = findConfigDir(); + File workDir = findWorkDir(); VaultProperties vaultProperties = new VaultProperties(); vaultProperties.getSsl().setTrustStorePassword("changeit"); @@ -50,43 +50,72 @@ public static VaultProperties createVaultProperties() { */ public static SslConfiguration createSslConfiguration() { - File workDir = findConfigDir(); + File workDir = findWorkDir(); return SslConfiguration.forTrustStore(new FileSystemResource(new File(workDir, "keystore.jks")), "changeit".toCharArray()); } /** - * Find the {@code config} directory, starting at the {@code user.dir} directory. - * Search is performed by walking the parent directories. - * @return the {@link File} pointing to the {@code config} directory - * @throws IllegalStateException If the {@code config} directory cannot be found. + * Find the {@code work} directory, starting at the {@code user.dir} directory. Search + * is performed by walking the parent directories. + * @return the {@link File} pointing to the {@code work} directory + * @throws IllegalStateException If the {@code work} directory cannot be found. + */ + public static File findWorkDir() { + return findWorkDir(new File(System.getProperty("user.dir"))); + } + + /** + * Find the {@code work} directory, starting at the given {@code directory}. Search is + * performed by walking the parent directories. + * @return the {@link File} pointing to the {@code work} directory + * @throws IllegalStateException If the {@code work} directory cannot be found. + */ + public static File findWorkDir(File directory) { + return findDir(directory, "work"); + } + + /** + * Find the {@code work} directory, starting at the {@code user.dir} directory. Search + * is performed by walking the parent directories. + * @return the {@link File} pointing to the {@code work} directory + * @throws IllegalStateException If the {@code work} directory cannot be found. */ public static File findConfigDir() { return findConfigDir(new File(System.getProperty("user.dir"))); } /** - * Find the {@code config} directory, starting at the given {@code directory}. Search - * is performed by walking the parent directories. - * @return the {@link File} pointing to the {@code config} directory - * @throws IllegalStateException If the {@code config} directory cannot be found. + * Find the {@code work} directory, starting at the given {@code directory}. Search is + * performed by walking the parent directories. + * @return the {@link File} pointing to the {@code work} directory + * @throws IllegalStateException If the {@code work} directory cannot be found. */ public static File findConfigDir(File directory) { + return findDir(directory, "config"); + } + /** + * Find the {@code toFind} directory, starting at the given {@code dirToSearch}. Search is + * performed by walking the parent directories. + * @return the {@link File} pointing to the {@code toFind} directory + * @throws IllegalStateException If the {@code toFind} directory cannot be found. + */ + public static File findDir(File dirToSearch, String toFind) { - File searchLevel = directory; + File searchLevel = dirToSearch; while (searchLevel.getParentFile() != null && searchLevel.getParentFile() != searchLevel) { - File file = new File(searchLevel, "config"); - if (file.isDirectory() && file.exists()) { - return file; + File work = new File(searchLevel, toFind); + if (work.isDirectory() && work.exists()) { + return work; } searchLevel = searchLevel.getParentFile(); } throw new IllegalStateException(String.format("Cannot find work directory in %s or any parent directories", - directory.getAbsoluteFile())); + dirToSearch.getAbsoluteFile())); } /** diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java index cfaa15e29..223a9c584 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java @@ -127,14 +127,15 @@ public static VaultContainer createContainer(String version) { catch (IOException e) { throw new RuntimeException(e); } + Path work = Settings.findWorkDir().toPath(); String dockerImageName = "hashicorp/vault:" + version; VaultContainer container = (VaultContainer) new VaultContainer(dockerImageName) // .withEnv("VAULT_LOG_LEVEL", "debug") .withEnv("VAULT_LOCAL_CONFIG", vaultConfig) - .withCopyFileToContainer(MountableFile.forHostPath(config.resolve("ca/certs/localhost.cert.pem"), 0777), + .withCopyFileToContainer(MountableFile.forHostPath(work.resolve("ca/certs/localhost.cert.pem"), 0777), "/tmp/localhost.cert.pem") .withCopyFileToContainer( - MountableFile.forHostPath(config.resolve("ca/private/localhost.decrypted.key.pem"), 0777), + MountableFile.forHostPath(work.resolve("ca/private/localhost.decrypted.key.pem"), 0777), "/tmp/localhost.decrypted.key.pem") .withCommand("server") .withLogConsumer(new Slf4jLogConsumer(logger).withSeparateOutputStreams()); From 1e093a203d0f04109c01b9bae9de995f28ac583b Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 18 Jun 2026 15:26:20 -0400 Subject: [PATCH 3/4] Updates vault-config tests --- .../config/ReactiveVaultOperationsTests.java | 6 ++--- .../VaultConfigLoaderSingleLocationTests.java | 7 +++--- .../vault/config/VaultConfigLoaderTests.java | 3 +-- .../cloud/vault/config/VaultConfigTests.java | 2 +- ...igTlsCertAuthenticationMountPathTests.java | 3 ++- .../VaultVersionedKvBackendConfigTests.java | 6 ++--- .../vault/util/IntegrationTestSupport.java | 2 +- .../cloud/vault/util/Settings.java | 5 ++-- .../vault/util/TestRestTemplateFactory.java | 8 ++++++- .../cloud/vault/util/VaultRule.java | 23 +++++++++++-------- 10 files changed, 38 insertions(+), 27 deletions(-) diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java index 133c33423..41fd6637e 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ReactiveVaultOperationsTests.java @@ -44,8 +44,7 @@ * @author Mark Paluch */ @SpringBootTest(classes = ReactiveVaultOperationsTests.TestApplication.class, - properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.uri=https://localhost:8200", - "spring.cloud.bootstrap.enabled=true" }) + properties = { "spring.cloud.bootstrap.enabled=true" }) public class ReactiveVaultOperationsTests { @Autowired @@ -56,12 +55,13 @@ public static void beforeClass() { VaultRule vaultRule = new VaultRule(); vaultRule.before(); + VaultRule.initializeSystemProperties(); Map object = new HashMap<>(); object.put("vault.value", "foo"); object.put("nested", Collections.singletonMap("key", "value")); - vaultRule.prepare().getVaultOperations().write("secret/testVaultApp", object); + VaultRule.prepare().getVaultOperations().write("secret/testVaultApp", object); } @Test diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderSingleLocationTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderSingleLocationTests.java index 58d11b153..4998cb713 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderSingleLocationTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderSingleLocationTests.java @@ -44,8 +44,8 @@ * * @author Mark Paluch */ -@SpringBootTest(classes = VaultConfigLoaderSingleLocationTests.TestApplication.class, properties = { - "spring.cloud.vault.uri=https://localhost:8200", "spring.config.import=vault:secret/config-location" }) +@SpringBootTest(classes = VaultConfigLoaderSingleLocationTests.TestApplication.class, + properties = { "spring.config.import=vault:secret/config-location" }) public class VaultConfigLoaderSingleLocationTests { @Autowired @@ -59,12 +59,13 @@ public static void beforeClass() { VaultRule vaultRule = new VaultRule(); vaultRule.before(); + VaultRule.initializeSystemProperties(); Map object = new HashMap<>(); object.put("vault-key", "config-data works"); object.put("nested", Collections.singletonMap("key", "value")); - vaultRule.prepare().getVaultOperations().write("secret/config-location", object); + VaultRule.prepare().getVaultOperations().write("secret/config-location", object); } @Test diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderTests.java index 47a7810ef..34e45e8e9 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigLoaderTests.java @@ -48,8 +48,7 @@ * @author Mark Paluch */ @SpringBootTest(classes = VaultConfigLoaderTests.TestApplication.class, - properties = { "spring.cloud.vault.uri=https://localhost:8200", - "spring.cloud.vault.application-name=config-data", "spring.config.import=vault:" }) + properties = { "spring.cloud.vault.application-name=config-data", "spring.config.import=vault:" }) public class VaultConfigLoaderTests { @Value("${vault.value}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java index d1fe76a4b..88a8fa4f4 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTests.java @@ -71,7 +71,7 @@ public static void beforeClass() { object.put("vault.value", "foo"); object.put("nested", Collections.singletonMap("key", "value")); - vaultRule.prepare().getVaultOperations().write("secret/testVaultApp", object); + VaultRule.prepare().getVaultOperations().write("secret/testVaultApp", object); } @Test diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java index 23d99d712..b836544da 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationMountPathTests.java @@ -61,6 +61,7 @@ public static void beforeClass() { VaultRule vaultRule = new VaultRule(); vaultRule.before(); + VaultRule.initializeSystemProperties(); VaultProperties vaultProperties = Settings.createVaultProperties(); @@ -73,7 +74,7 @@ public static void beforeClass() { .authMount(vaultProperties.getSsl().getCertAuthPath(), VaultMount.builder().type("cert").build()); } - VaultOperations vaultOperations = vaultRule.prepare().getVaultOperations(); + VaultOperations vaultOperations = VaultRule.prepare().getVaultOperations(); String rules = "path \"*\" {\n capabilities = [\"read\"]\n}"; diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java index e94c49692..a9011db7d 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultVersionedKvBackendConfigTests.java @@ -51,10 +51,8 @@ */ @SpringBootTest(classes = VaultVersionedKvBackendConfigTests.TestApplication.class, - properties = { "spring.cloud.vault.host=foo", "spring.cloud.vault.port=80", - "spring.cloud.vault.uri=https://localhost:8200", "spring.cloud.vault.kv.enabled=true", - "spring.cloud.vault.kv.backend=versioned", "spring.cloud.vault.application-name=testVaultApp", - "spring.cloud.bootstrap.enabled=true" }) + properties = { "spring.cloud.vault.kv.enabled=true", "spring.cloud.vault.kv.backend=versioned", + "spring.cloud.vault.application-name=testVaultApp", "spring.cloud.bootstrap.enabled=true" }) public class VaultVersionedKvBackendConfigTests { @Value("${vault.value}") diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java index ea2efe7bd..88976f9e4 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java @@ -29,7 +29,7 @@ public abstract class IntegrationTestSupport { public final VaultRule vaultRule = new VaultRule(); public final PrepareVault prepare() { - return this.vaultRule.prepare(); + return VaultRule.prepare(); } } diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java index fd3937034..f7244009d 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/Settings.java @@ -95,9 +95,10 @@ public static File findConfigDir() { public static File findConfigDir(File directory) { return findDir(directory, "config"); } + /** - * Find the {@code toFind} directory, starting at the given {@code dirToSearch}. Search is - * performed by walking the parent directories. + * Find the {@code toFind} directory, starting at the given {@code dirToSearch}. + * Search is performed by walking the parent directories. * @return the {@link File} pointing to the {@code toFind} directory * @throws IllegalStateException If the {@code toFind} directory cannot be found. */ diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/TestRestTemplateFactory.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/TestRestTemplateFactory.java index f47b6b617..48298a573 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/TestRestTemplateFactory.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/TestRestTemplateFactory.java @@ -39,7 +39,13 @@ */ public class TestRestTemplateFactory { - public static final VaultEndpoint TEST_VAULT_ENDPOINT = new VaultEndpoint(); + public static final VaultEndpoint TEST_VAULT_ENDPOINT; + + static { + VaultRule.createContainer(); + VaultRule.initializeSystemProperties(); + TEST_VAULT_ENDPOINT = VaultRule.vaultEndpoint(); + } private static final AtomicReference factoryCache = new AtomicReference<>(); diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java index 223a9c584..3c89f292f 100644 --- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java +++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java @@ -86,7 +86,7 @@ public VaultRule(SslConfiguration sslConfiguration, VaultEndpoint vaultEndpoint) startVault(); if (vaultEndpoint == null) { - this.vaultEndpoint = VaultEndpoint.create(vaultContainer.getHost(), vaultContainer.getMappedPort(8200)); + this.vaultEndpoint = vaultEndpoint(); // this.vaultEndpoint.setScheme("http"); // ignore ssl for now } else { @@ -100,6 +100,10 @@ public VaultRule(SslConfiguration sslConfiguration, VaultEndpoint vaultEndpoint) prepareVault = new PrepareVault(vaultTemplate); } + public static VaultEndpoint vaultEndpoint() { + return VaultEndpoint.create(vaultContainer.getHost(), vaultContainer.getMappedPort(8200)); + } + public static PrepareVault prepare() { return prepareVault; } @@ -185,19 +189,20 @@ public void before() { this.vaultEndpoint.getPort(), getClass().getSimpleName())); } - if (!this.prepareVault.isAvailable()) { + if (!prepareVault.isAvailable()) { - this.token = this.prepareVault.initializeVault(); - this.prepareVault.awaitAvailable(); - this.prepareVault.createToken(Settings.token().getToken(), "root"); + this.token = prepareVault.initializeVault(); + prepareVault.awaitAvailable(); + prepareVault.createToken(Settings.token().getToken(), "root"); - if (this.prepareVault.getVersion().isGreaterThanOrEqualTo(VERSIONING_INTRODUCED_WITH)) { - this.prepareVault.ensureUnversionedSecretsEngine(); - this.prepareVault.mountVersionedKvSecretsEngine(); + if (prepareVault.getVersion().isGreaterThanOrEqualTo(VERSIONING_INTRODUCED_WITH)) { + prepareVault.ensureUnversionedSecretsEngine(); + prepareVault.mountVersionedKvSecretsEngine(); } this.token = Settings.token(); } + initializeSystemProperties(); } /* @@ -207,7 +212,7 @@ public void before() { * * @Override public Object resolveParameter(ParameterContext parameterContext, * ExtensionContext extensionContext) throws ParameterResolutionException { return - * this.prepareVault; } + * prepareVault; } */ private class PreparingSessionManager implements SessionManager { From 66751ec9bba5e78e8a9090277b768552acd73d84 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 18 Jun 2026 15:29:06 -0400 Subject: [PATCH 4/4] Moves vault testcontainers to parent pom --- pom.xml | 7 +++++++ spring-cloud-vault-config/pom.xml | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 41039e704..c47a43952 100644 --- a/pom.xml +++ b/pom.xml @@ -181,6 +181,13 @@ 3.18.1 test + + + org.testcontainers + vault + 1.21.4 + test + diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml index d39de74ab..bce7e1d06 100644 --- a/spring-cloud-vault-config/pom.xml +++ b/spring-cloud-vault-config/pom.xml @@ -180,12 +180,6 @@ test - - org.testcontainers - vault - 1.21.4 - test -