From 3524c0009096c3dad96c1ff6a2182167b2e6afda Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Fri, 30 Apr 2021 17:20:56 -0700 Subject: [PATCH] fix: nats testdata relocation fix --- cmd/config/identity/openid/ecdsa-sha3_contrib.go | 4 ++-- cmd/config/identity/openid/rsa-sha3_contrib.go | 4 ++-- pkg/event/target/testdata/contrib/nats_tls.conf | 4 ++-- pkg/event/target/testdata/contrib/nats_tls_client_cert.conf | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/config/identity/openid/ecdsa-sha3_contrib.go b/cmd/config/identity/openid/ecdsa-sha3_contrib.go index 9e39c87ca..93fc539ab 100644 --- a/cmd/config/identity/openid/ecdsa-sha3_contrib.go +++ b/cmd/config/identity/openid/ecdsa-sha3_contrib.go @@ -1,3 +1,5 @@ +// +build !fips + /* * MinIO Object Storage (c) 2021 MinIO, Inc. * @@ -14,8 +16,6 @@ * limitations under the License. */ -// +build !fips - package openid import ( diff --git a/cmd/config/identity/openid/rsa-sha3_contrib.go b/cmd/config/identity/openid/rsa-sha3_contrib.go index 00e0f19d0..cf29cd824 100644 --- a/cmd/config/identity/openid/rsa-sha3_contrib.go +++ b/cmd/config/identity/openid/rsa-sha3_contrib.go @@ -1,3 +1,5 @@ +// +build !fips + /* * MinIO Object Storage (c) 2021 MinIO, Inc. * @@ -14,8 +16,6 @@ * limitations under the License. */ -// +build !fips - package openid import ( diff --git a/pkg/event/target/testdata/contrib/nats_tls.conf b/pkg/event/target/testdata/contrib/nats_tls.conf index 2ca45f6ef..d7c90b686 100644 --- a/pkg/event/target/testdata/contrib/nats_tls.conf +++ b/pkg/event/target/testdata/contrib/nats_tls.conf @@ -2,6 +2,6 @@ port: 14225 net: localhost tls { - cert_file: "./testdata/certs/nats_server_cert.pem" - key_file: "./testdata/certs/nats_server_key.pem" + cert_file: "./testdata/contrib/certs/nats_server_cert.pem" + key_file: "./testdata/contrib/certs/nats_server_key.pem" } diff --git a/pkg/event/target/testdata/contrib/nats_tls_client_cert.conf b/pkg/event/target/testdata/contrib/nats_tls_client_cert.conf index f87b7e80e..c112581e8 100644 --- a/pkg/event/target/testdata/contrib/nats_tls_client_cert.conf +++ b/pkg/event/target/testdata/contrib/nats_tls_client_cert.conf @@ -2,9 +2,9 @@ port: 14226 net: localhost tls { - cert_file: "./testdata/certs/nats_server_cert.pem" - key_file: "./testdata/certs/nats_server_key.pem" - ca_file: "./testdata/certs/root_ca_cert.pem" + cert_file: "./testdata/contrib/certs/nats_server_cert.pem" + key_file: "./testdata/contrib/certs/nats_server_key.pem" + ca_file: "./testdata/contrib/certs/root_ca_cert.pem" verify_and_map: true } authorization {