You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2022/10/14 16:07:03 UTC
[accumulo-testing] branch main updated: More carefully update license headers
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-testing.git
The following commit(s) were added to refs/heads/main by this push:
new 6d6f4e2 More carefully update license headers
6d6f4e2 is described below
commit 6d6f4e2cf1d64f44fc7912ec5042592c4e4a7a98
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Fri Oct 14 12:05:11 2022 -0400
More carefully update license headers
Fix issues with #244 by more carefully updating license headers in
Terraform templates
Remove problematic, or potentially problematic (and definitely
unnecessary) license headers in cloud-init, genders, bash profile, and
hosts Terraform template files
---
.../cloud-init-config/templates/cloud-init.tftpl | 19 -----------
.../config-files/templates/core-site.xml.tftpl | 39 +++++++++++-----------
.../modules/config-files/templates/genders.tftpl | 19 -----------
.../templates/hadoop_bash_profile.tftpl | 19 -----------
.../config-files/templates/hadoop_bashrc.tftpl | 19 -----------
.../config-files/templates/hdfs-site.xml.tftpl | 39 +++++++++++-----------
.../modules/config-files/templates/hosts.tftpl | 19 -----------
.../templates/initialize_accumulo.sh.tftpl | 3 +-
.../templates/initialize_hadoop.sh.tftpl | 3 +-
.../config-files/templates/install_sw.sh.tftpl | 3 +-
.../config-files/templates/yarn-site.xml.tftpl | 39 +++++++++++-----------
pom.xml | 4 ++-
12 files changed, 66 insertions(+), 159 deletions(-)
diff --git a/contrib/terraform-testing-infrastructure/modules/cloud-init-config/templates/cloud-init.tftpl b/contrib/terraform-testing-infrastructure/modules/cloud-init-config/templates/cloud-init.tftpl
index f7932db..0593b10 100644
--- a/contrib/terraform-testing-infrastructure/modules/cloud-init-config/templates/cloud-init.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/cloud-init-config/templates/cloud-init.tftpl
@@ -1,22 +1,3 @@
-#
-# 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
-#
-# https://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.
-#
-
#cloud-config
#
# Don't log key information
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/core-site.xml.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/core-site.xml.tftpl
index 7ec0e32..7df9093 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/core-site.xml.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/core-site.xml.tftpl
@@ -1,24 +1,25 @@
-#
-# 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
-#
-# https://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.
-#
-
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+
+ 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
+
+ https://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.
+
+-->
<configuration>
<property>
<name>fs.defaultFS</name>
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/genders.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/genders.tftpl
index 9747cb8..15d2043 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/genders.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/genders.tftpl
@@ -1,22 +1,3 @@
-#
-# 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
-#
-# https://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.
-#
-
manager manager
%{ for index, ip in worker_ips ~}
worker${index} worker
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bash_profile.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bash_profile.tftpl
index bba7ec5..fdff0a1 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bash_profile.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bash_profile.tftpl
@@ -1,22 +1,3 @@
-#
-# 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
-#
-# https://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.
-#
-
# .bash_profile
# Get the aliases and functions
if [ -f ~/.bashrc ]; then
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bashrc.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bashrc.tftpl
index 9004b9f..f112101 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bashrc.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hadoop_bashrc.tftpl
@@ -1,22 +1,3 @@
-#
-# 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
-#
-# https://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.
-#
-
# .bashrc
if [ -f /etc/bashrc ]; then
source /etc/bashrc
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hdfs-site.xml.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hdfs-site.xml.tftpl
index 2f61cd6..2210c8b 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hdfs-site.xml.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hdfs-site.xml.tftpl
@@ -1,24 +1,25 @@
-#
-# 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
-#
-# https://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.
-#
-
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+
+ 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
+
+ https://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.
+
+-->
<configuration>
<property>
<name>dfs.datanode.synconclose</name>
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hosts.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hosts.tftpl
index 45d399f..1bac9e2 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/hosts.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/hosts.tftpl
@@ -1,22 +1,3 @@
-#
-# 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
-#
-# https://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.
-#
-
${manager_ip} manager
%{ for idx, ip in worker_ips ~}
${ip} worker${idx}
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
index db39cdb..89e9c2a 100755
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_accumulo.sh.tftpl
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,7 +18,6 @@
# under the License.
#
-
set -eo pipefail
if [ $# -ne 2 ]; then
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_hadoop.sh.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_hadoop.sh.tftpl
index d973354..e3c8902 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_hadoop.sh.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/initialize_hadoop.sh.tftpl
@@ -1,4 +1,4 @@
-#!/bin/bash
+#! /usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,7 +18,6 @@
# under the License.
#
-
set -eo pipefail
#
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
index 2a58c35..397dcc2 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/install_sw.sh.tftpl
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -18,7 +18,6 @@
# under the License.
#
-
set -eo pipefail
export JAVA_HOME=${java_home}
diff --git a/contrib/terraform-testing-infrastructure/modules/config-files/templates/yarn-site.xml.tftpl b/contrib/terraform-testing-infrastructure/modules/config-files/templates/yarn-site.xml.tftpl
index 42cf2ba..76547c7 100644
--- a/contrib/terraform-testing-infrastructure/modules/config-files/templates/yarn-site.xml.tftpl
+++ b/contrib/terraform-testing-infrastructure/modules/config-files/templates/yarn-site.xml.tftpl
@@ -1,24 +1,25 @@
-#
-# 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
-#
-# https://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.
-#
-
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+
+ 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
+
+ https://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.
+
+-->
<configuration>
<property>
<name>yarn.resourcemanager.hostname</name>
diff --git a/pom.xml b/pom.xml
index 15a5ac1..fcc758c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,6 +140,8 @@
<exclude>**/NOTICE</exclude>
<exclude>**/target/**</exclude>
<exclude>**/lib/data/**</exclude>
+ <!-- template types are in various formats; update manually if needed -->
+ <exclude>**/*.tftpl</exclude>
</excludes>
<mapping combine.children="append">
<!-- general mappings; module-specific mappings appear in their respective pom -->
@@ -166,7 +168,6 @@
<java>SLASHSTAR_STYLE</java>
<proto>SLASHSTAR_STYLE</proto>
<tf>SCRIPT_STYLE</tf>
- <tftpl>SCRIPT_STYLE</tftpl>
<thrift>SLASHSTAR_STYLE</thrift>
<uno>SCRIPT_STYLE</uno>
</mapping>
@@ -303,6 +304,7 @@
<exclude>test/bench/lib/data/*</exclude>
<exclude>test/compat/japi-compliance/exclude_classes.txt</exclude>
<exclude>contrib/terraform-testing-infrastructure/**/terraform.tfstate*</exclude>
+ <exclude>contrib/terraform-testing-infrastructure/**/*.tftpl</exclude>
<exclude>contrib/terraform-testing-infrastructure/**/.terraform/**</exclude>
<exclude>contrib/terraform-testing-infrastructure/**/.terraform*</exclude>
<exclude>contrib/terraform-testing-infrastructure/**/*auto.tfvars*</exclude>