From cfa249ddc78b794126416f5939883a9aa281d8a1 Mon Sep 17 00:00:00 2001 From: exceptionfactory Date: Mon, 3 Feb 2025 22:33:52 -0600 Subject: [PATCH] NIFI-14229 Removed unused Registry bootstrap configuration files Signed-off-by: Pierre Villard This closes #9692. --- .../main/resources/conf/bootstrap-aws.conf | 27 ---------- .../main/resources/conf/bootstrap-azure.conf | 24 --------- .../main/resources/conf/bootstrap-gcp.conf | 22 -------- .../conf/bootstrap-hashicorp-vault.conf | 53 ------------------- 4 files changed, 126 deletions(-) delete mode 100644 nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-aws.conf delete mode 100644 nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-azure.conf delete mode 100644 nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-gcp.conf delete mode 100644 nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-hashicorp-vault.conf diff --git a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-aws.conf b/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-aws.conf deleted file mode 100644 index f624dec9b1ac..000000000000 --- a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-aws.conf +++ /dev/null @@ -1,27 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# AWS KMS Key ID is required to be configured for AWS KMS Sensitive Property Provider -aws.kms.key.id= - -# NiFi uses the following properties when authentication to AWS when all values are provided. -# NiFi uses the default AWS credentials provider chain when one or more or the following properties are blank -# AWS SDK documentation describes the default credential retrieval order: -# https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials.html#credentials-chain -aws.access.key.id= -aws.secret.access.key= -aws.region= diff --git a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-azure.conf b/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-azure.conf deleted file mode 100644 index 49e318eaad9a..000000000000 --- a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-azure.conf +++ /dev/null @@ -1,24 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Key Identifier for Azure Key Vault Key Sensitive Property Provider -azure.keyvault.key.id= -# Encryption Algorithm for Azure Key Vault Key Sensitive Property Provider -azure.keyvault.encryption.algorithm= - -# Vault URI for Azure Key Vault Secret Sensitive Property Provider -azure.keyvault.uri= diff --git a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-gcp.conf b/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-gcp.conf deleted file mode 100644 index 440dad2360e9..000000000000 --- a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-gcp.conf +++ /dev/null @@ -1,22 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# These GCP KMS settings must all be configured in order to use the GCP KMS Sensitive Property Provider -gcp.kms.project= -gcp.kms.location= -gcp.kms.keyring= -gcp.kms.key= \ No newline at end of file diff --git a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-hashicorp-vault.conf b/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-hashicorp-vault.conf deleted file mode 100644 index bf6975b962f2..000000000000 --- a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap-hashicorp-vault.conf +++ /dev/null @@ -1,53 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# HTTP or HTTPS URI for HashiCorp Vault is required to enable the Sensitive Properties Provider -vault.uri= - -# Transit Path is required to enable the Sensitive Properties Provider Protection Scheme 'hashicorp/vault/transit/{path}' -vault.transit.path= - -# Key/Value Path is required to enable the Sensitive Properties Provider Protection Scheme 'hashicorp/vault/kv/{path}' -vault.kv.path= -# Key/Value Secrets Engine version may be 1 or 2, and defaults to 1 -# vault.kv.version=1 - -# Token Authentication example properties -# vault.authentication=TOKEN -# vault.token= - -# Optional file supports authentication properties described in the Spring Vault Environment Configuration -# https://docs.spring.io/spring-vault/docs/2.3.x/reference/html/#vault.core.environment-vault-configuration -# -# All authentication properties must be included in bootstrap-hashicorp-vault.conf when this property is not specified. -# Properties in bootstrap-hashicorp-vault.conf take precedence when the same values are defined in both files. -# Token Authentication is the default when the 'vault.authentication' property is not specified. -vault.authentication.properties.file= - -# Optional Timeout properties -vault.connection.timeout=5 secs -vault.read.timeout=15 secs - -# Optional TLS properties -vault.ssl.enabledCipherSuites= -vault.ssl.enabledProtocols= -vault.ssl.key-store= -vault.ssl.key-store-type= -vault.ssl.key-store-password= -vault.ssl.trust-store= -vault.ssl.trust-store-type= -vault.ssl.trust-store-password=