From d7fa7b5829602d006d201a118770be4c32d0e6b4 Mon Sep 17 00:00:00 2001 From: Sergio Arroutbi Date: Mon, 25 Sep 2023 10:32:28 +0200 Subject: [PATCH] Homogeneize licensing (Apache 2.0 to all) (#158) Resolves: #150 Signed-off-by: Sergio Arroutbi --- tools/api_tools/api_explore.sh | 22 ++++++++--------- tools/api_tools/delete_one_hidden_key.sh | 15 ++++++++++++ tools/api_tools/key_rotate.sh | 15 ++++++++++++ tools/api_tools/show_keys.sh | 15 ++++++++++++ tools/change-readme-version.sh | 26 ++++++++------------- tools/cluster_tools/add_cluster.sh | 26 ++++++++------------- tools/index_tools/tang_index.sh | 25 ++++++++++++++++---- tools/index_tools/tang_install_catalog.sh | 26 ++++++++------------- tools/index_tools/tang_uninstall_catalog.sh | 16 +++++++++++++ tools/step_by_step/step_by_step_00.sh | 21 ++++++++--------- tools/test_memleak.sh | 26 ++++++++------------- 11 files changed, 142 insertions(+), 91 deletions(-) diff --git a/tools/api_tools/api_explore.sh b/tools/api_tools/api_explore.sh index 5d2368ba..07dc99f1 100755 --- a/tools/api_tools/api_explore.sh +++ b/tools/api_tools/api_explore.sh @@ -1,19 +1,19 @@ #!/bin/bash -# Copyright 2021. # -# Licensed 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 +# Copyright [2023] [sarroutb (at) redhat.com] # -# http://www.apache.org/licenses/LICENSE-2.0 +# Licensed 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 # -# 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://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. # - # Uncomment next line to dump verbose information in script execution: # set -x diff --git a/tools/api_tools/delete_one_hidden_key.sh b/tools/api_tools/delete_one_hidden_key.sh index 4f621c0e..b878956d 100755 --- a/tools/api_tools/delete_one_hidden_key.sh +++ b/tools/api_tools/delete_one_hidden_key.sh @@ -1,4 +1,19 @@ #!/bin/bash -e +# +# Copyright [2023] [sarroutb (at) redhat.com] +# +# Licensed 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. +# namespace="" diff --git a/tools/api_tools/key_rotate.sh b/tools/api_tools/key_rotate.sh index 627b2971..3b77b2af 100755 --- a/tools/api_tools/key_rotate.sh +++ b/tools/api_tools/key_rotate.sh @@ -1,4 +1,19 @@ #!/bin/bash -e +# +# Copyright [2023] [sarroutb (at) redhat.com] +# +# Licensed 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. +# namespace="" diff --git a/tools/api_tools/show_keys.sh b/tools/api_tools/show_keys.sh index 9183d8f5..0bd4d704 100755 --- a/tools/api_tools/show_keys.sh +++ b/tools/api_tools/show_keys.sh @@ -1,4 +1,19 @@ #!/bin/bash -e +# +# Copyright [2023] [sarroutb (at) redhat.com] +# +# Licensed 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. +# namespace="" using_minikube="" diff --git a/tools/change-readme-version.sh b/tools/change-readme-version.sh index 93494d05..915eaaa1 100755 --- a/tools/change-readme-version.sh +++ b/tools/change-readme-version.sh @@ -1,24 +1,18 @@ #!/bin/bash # -# Copyright 2022 sarroutb@redhat.com +# Copyright [2023] [sarroutb (at) redhat.com] # -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: +# Licensed 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 # -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. +# http://www.apache.org/licenses/LICENSE-2.0 # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# 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. # OPTIND=1 OLD_VERSION="" diff --git a/tools/cluster_tools/add_cluster.sh b/tools/cluster_tools/add_cluster.sh index 90a119bc..28007300 100755 --- a/tools/cluster_tools/add_cluster.sh +++ b/tools/cluster_tools/add_cluster.sh @@ -1,24 +1,18 @@ #!/bin/bash # -# Copyright 2023 sarroutb@redhat.com +# Copyright [2023] [sarroutb (at) redhat.com] # -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: +# Licensed 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 # -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. +# http://www.apache.org/licenses/LICENSE-2.0 # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# 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. # OPTIND=1 CONFIG_FILE="" diff --git a/tools/index_tools/tang_index.sh b/tools/index_tools/tang_index.sh index 27bdb470..0130c770 100755 --- a/tools/index_tools/tang_index.sh +++ b/tools/index_tools/tang_index.sh @@ -1,10 +1,25 @@ #!/bin/bash -# Parameters: -# 1 - $1 image: quay.io/ -# 2 - $2 is for release, format like 0.0.25-1 -# Example: # -# ./tang_index.sh quay.io/sec-eng-special/tang-operator-bundle:1.0.0-0 1.0.0-0 +# Copyright [2023] [sarroutb (at) redhat.com] +# +# Licensed 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. +# +# Parameters: +# 1 - $1 image: quay.io/ +# 2 - $2 is for release, format like 0.0.25-1 +# Example: +# +# ./tang_index.sh quay.io/sec-eng-special/tang-operator-bundle:1.0.0-0 1.0.0-0 # # CONTAINER_MGR='docker' diff --git a/tools/index_tools/tang_install_catalog.sh b/tools/index_tools/tang_install_catalog.sh index 591b306c..23ceec29 100755 --- a/tools/index_tools/tang_install_catalog.sh +++ b/tools/index_tools/tang_install_catalog.sh @@ -1,24 +1,18 @@ #!/bin/bash # -# Copyright 2023 sarroutb@redhat.com +# Copyright [2023] [sarroutb (at) redhat.com] # -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: +# Licensed 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 # -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. +# http://www.apache.org/licenses/LICENSE-2.0 # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# 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. # list_only="" diff --git a/tools/index_tools/tang_uninstall_catalog.sh b/tools/index_tools/tang_uninstall_catalog.sh index 646e7d87..2e87aa7a 100755 --- a/tools/index_tools/tang_uninstall_catalog.sh +++ b/tools/index_tools/tang_uninstall_catalog.sh @@ -1,3 +1,19 @@ #!/bin/bash +# +# Copyright [2023] [sarroutb (at) redhat.com] +# +# Licensed 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. +# + oc delete -f tang_subscription.yaml oc delete -f tang_catalog_source.yaml diff --git a/tools/step_by_step/step_by_step_00.sh b/tools/step_by_step/step_by_step_00.sh index a88a478e..5c2b937c 100755 --- a/tools/step_by_step/step_by_step_00.sh +++ b/tools/step_by_step/step_by_step_00.sh @@ -1,20 +1,19 @@ #!/bin/bash # -# Copyright 2022 +# Copyright [2023] [sarroutb (at) redhat.com] # -# Licensed 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 +# Licensed 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 +# 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. +# 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. # - namespace="" wait_secs=15 wait_up_secs=30 diff --git a/tools/test_memleak.sh b/tools/test_memleak.sh index 3a9cc6e4..c7d9db99 100755 --- a/tools/test_memleak.sh +++ b/tools/test_memleak.sh @@ -1,24 +1,18 @@ #!/bin/bash # -# Copyright 2023 sarroutb@redhat.com +# Copyright [2023] [sarroutb (at) redhat.com] # -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: +# Licensed 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 # -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. +# http://www.apache.org/licenses/LICENSE-2.0 # -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE -# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# 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. # counter=0 oc apply -f config/minimal-keyretrieve