diff --git a/.gitignore b/.gitignore index 62b3943..bcae28f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - .idea *.un~ /build diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b67f70c..035ef05 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. - ---- minimum_pre_commit_version: 1.15.2 repos: - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/LICENSE b/LICENSE index 5ba01ba..410f09d 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright (c) 2021-2025 Broadcom Inc. All rights reserved. + Copyright (c) 2021-2026 Broadcom Inc. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/NOTICE b/NOTICE index 29c73b0..9980069 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. +Copyright (c) 2021-2026 Broadcom Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/linux/svtminion.sh b/linux/svtminion.sh index b1735c2..86286b2 100755 --- a/linux/svtminion.sh +++ b/linux/svtminion.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. +# Copyright (c) 2021-2026 Broadcom Inc. All Rights Reserved. # SPDX-License-Identifier: Apache-2 ## Salt VMware Tools Integration script @@ -89,7 +89,7 @@ call " readonly salt_minion_service_wrapper=\ -"# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. +"# Copyright (c) 2021-2026 Broadcom Inc. All Rights Reserved. # SPDX-License-Identifier: Apache-2 [Unit] @@ -1287,7 +1287,7 @@ _create_pre_3006_helper_scripts() { echo "#!/usr/bin/env bash -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. +# Copyright (c) 2021-2026 Broadcom Inc. All Rights Reserved. " > "${abs_filepath}" || { _error_log "$0:${FUNCNAME[0]} failed to create helper file "\ "'salt-${idx}' in directory /usr/bin, retcode '$?'"; diff --git a/tests/linux/test-linux.sh b/tests/linux/test-linux.sh index 54481ec..7f8c4d4 100755 --- a/tests/linux/test-linux.sh +++ b/tests/linux/test-linux.sh @@ -1,8 +1,5 @@ #!/bin/bash -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - # Testing assumes RedHat family oldpwd=$(pwd) diff --git a/tests/windows/functional/test_clear_logs.ps1 b/tests/windows/functional/test_clear_logs.ps1 index ddcbcec..2616b3e 100644 --- a/tests/windows/functional/test_clear_logs.ps1 +++ b/tests/windows/functional/test_clear_logs.ps1 @@ -1,5 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 $target_dir = "$script_log_dir\spongebob" $target_file = "$script_log_dir\squarepants.txt" diff --git a/tests/windows/functional/test_config.ps1 b/tests/windows/functional/test_config.ps1 index 9d8f54e..d11ed7f 100644 --- a/tests/windows/functional/test_config.ps1 +++ b/tests/windows/functional/test_config.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function setUpScript { # We need to create a tools.conf file with some settings Write-Host "Creating tools.conf: " -NoNewline diff --git a/tests/windows/functional/test_download.ps1 b/tests/windows/functional/test_download.ps1 index 782cf0d..ab21379 100644 --- a/tests/windows/functional/test_download.ps1 +++ b/tests/windows/functional/test_download.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $info = Get-SaltPackageInfo -MinionVersion "3006.1" $zip_file = "$base_salt_install_location\$($info.file_name)" diff --git a/tests/windows/functional/test_existing_salt.ps1 b/tests/windows/functional/test_existing_salt.ps1 index 9df90c3..ab5547b 100644 --- a/tests/windows/functional/test_existing_salt.ps1 +++ b/tests/windows/functional/test_existing_salt.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function setUp { Remove-Item -Path "C:\salt\bin\python.exe" -Force -ErrorAction SilentlyContinue New-Item -Path "HKLM:\SOFTWARE\Salt Project" -ErrorAction SilentlyContinue | Out-Null diff --git a/tests/windows/functional/test_get_filehash.ps1 b/tests/windows/functional/test_get_filehash.ps1 index 55fef3d..528098b 100644 --- a/tests/windows/functional/test_get_filehash.ps1 +++ b/tests/windows/functional/test_get_filehash.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $hash_dir= "$env:Temp\HashDir" $hash_file = "$env:Temp\HashFile.txt" diff --git a/tests/windows/functional/test_get_isreparsepoint.ps1 b/tests/windows/functional/test_get_isreparsepoint.ps1 index bfbc632..1049608 100644 --- a/tests/windows/functional/test_get_isreparsepoint.ps1 +++ b/tests/windows/functional/test_get_isreparsepoint.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $test_directory = "$env:Temp\spongebob" $test_file = "$env:Temp\mr.krabbs" $test_symlink = "$env:Temp\squidward" diff --git a/tests/windows/functional/test_get_salt_package_info.ps1 b/tests/windows/functional/test_get_salt_package_info.ps1 index 4cdf9be..32a73cd 100644 --- a/tests/windows/functional/test_get_salt_package_info.ps1 +++ b/tests/windows/functional/test_get_salt_package_info.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function setUpScript { $base_url = "$($pwd.Path)\tests\testarea" } diff --git a/tests/windows/functional/test_main.ps1 b/tests/windows/functional/test_main.ps1 index 5e7b6d0..3243628 100644 --- a/tests/windows/functional/test_main.ps1 +++ b/tests/windows/functional/test_main.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function test_Main_no_action { $result = Main if ($result -eq $STATUS_CODES["scriptFailed"]) { return 0 } diff --git a/tests/windows/functional/test_new_secure_directory.ps1 b/tests/windows/functional/test_new_secure_directory.ps1 index 4c07032..a1a8bcb 100644 --- a/tests/windows/functional/test_new_secure_directory.ps1 +++ b/tests/windows/functional/test_new_secure_directory.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $target_file = "$env:Temp\mr.krabbs" $target_dir = "$env:Temp\spongebob" $test_file = "$env:Temp\flying.dutchman" diff --git a/tests/windows/functional/test_parse_config.ps1 b/tests/windows/functional/test_parse_config.ps1 index 9a0581a..ce90bf6 100644 --- a/tests/windows/functional/test_parse_config.ps1 +++ b/tests/windows/functional/test_parse_config.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function test__parse_config_normal { $result = _parse_config -KeyValues "master=test id=test_min" if ($result["master"] -ne "test") { return 1 } diff --git a/tests/windows/functional/test_path.ps1 b/tests/windows/functional/test_path.ps1 index d525e45..e10f1a7 100644 --- a/tests/windows/functional/test_path.ps1 +++ b/tests/windows/functional/test_path.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $path_reg_key = "HKLM:\System\CurrentControlSet\Control\Session Manager\Environment" function test_Add-SystemPathValue { diff --git a/tests/windows/functional/test_random_id.ps1 b/tests/windows/functional/test_random_id.ps1 index b0343a6..642144c 100644 --- a/tests/windows/functional/test_random_id.ps1 +++ b/tests/windows/functional/test_random_id.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function test_Get-RandomizedId_random_id { $random_id = Get-RandomizedMinionId if ($random_id -match "^minion_[\w\d]{5}$") { return 0 } else { return 1 } diff --git a/tests/windows/functional/test_remove_file_or_folder.ps1 b/tests/windows/functional/test_remove_file_or_folder.ps1 index 61be828..e59453e 100644 --- a/tests/windows/functional/test_remove_file_or_folder.ps1 +++ b/tests/windows/functional/test_remove_file_or_folder.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $target_dir = "$env:Temp\TargetDir" $target_file = "$env:Temp\TargetFile.txt" $path_dir = "$env:Temp\RemoveDir" diff --git a/tests/windows/functional/test_secure_owner.ps1 b/tests/windows/functional/test_secure_owner.ps1 index 300358c..f0091b4 100644 --- a/tests/windows/functional/test_secure_owner.ps1 +++ b/tests/windows/functional/test_secure_owner.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $test_path = "$env:Temp\spongebob" function setUpScript { diff --git a/tests/windows/functional/test_security.ps1 b/tests/windows/functional/test_security.ps1 index df8a903..d65aea8 100644 --- a/tests/windows/functional/test_security.ps1 +++ b/tests/windows/functional/test_security.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $test_path = "$env:Temp\spongebob" function setUpScript { diff --git a/tests/windows/functional/test_service.ps1 b/tests/windows/functional/test_service.ps1 index b613638..7153ca0 100644 --- a/tests/windows/functional/test_service.ps1 +++ b/tests/windows/functional/test_service.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $Script:service_status = $null $Script:test_service = "CertPropSvc" diff --git a/tests/windows/functional/test_status.ps1 b/tests/windows/functional/test_status.ps1 index 19ed106..d617e14 100644 --- a/tests/windows/functional/test_status.ps1 +++ b/tests/windows/functional/test_status.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function setUp { Write-Host "Ensuring reg key present: " -NoNewline New-ItemProperty -Path $vmtools_base_reg ` diff --git a/tests/windows/functional/test_version.ps1 b/tests/windows/functional/test_version.ps1 index 6678beb..7075583 100644 --- a/tests/windows/functional/test_version.ps1 +++ b/tests/windows/functional/test_version.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function test_Version { $test_version = Get-Version if ( $env:CI_COMMIT_TAG ) { diff --git a/tests/windows/helpers.ps1 b/tests/windows/helpers.ps1 index 5eb2199..5040b64 100644 --- a/tests/windows/helpers.ps1 +++ b/tests/windows/helpers.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function Write-Header { [CmdletBinding()] param( diff --git a/tests/windows/integration/test_clear.ps1 b/tests/windows/integration/test_clear.ps1 index 3871034..9ba4413 100644 --- a/tests/windows/integration/test_clear.ps1 +++ b/tests/windows/integration/test_clear.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function setUpScript { Write-Host "Resetting environment: " -NoNewline diff --git a/tests/windows/integration/test_install_exact_ver.ps1 b/tests/windows/integration/test_install_exact_ver.ps1 index 26eaf5e..548d611 100644 --- a/tests/windows/integration/test_install_exact_ver.ps1 +++ b/tests/windows/integration/test_install_exact_ver.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $test_version = "3006.9" function setUpScript { diff --git a/tests/windows/integration/test_install_latest.ps1 b/tests/windows/integration/test_install_latest.ps1 index b660ba8..416010e 100644 --- a/tests/windows/integration/test_install_latest.ps1 +++ b/tests/windows/integration/test_install_latest.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function setUpScript { Write-Host "Resetting environment: " -NoNewline diff --git a/tests/windows/integration/test_install_major.ps1 b/tests/windows/integration/test_install_major.ps1 index e24f0b3..3a0d91a 100644 --- a/tests/windows/integration/test_install_major.ps1 +++ b/tests/windows/integration/test_install_major.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $test_version = "3006" function setUpScript { diff --git a/tests/windows/integration/test_reconfig_start_stop.ps1 b/tests/windows/integration/test_reconfig_start_stop.ps1 index b0ac9db..6e23ce2 100644 --- a/tests/windows/integration/test_reconfig_start_stop.ps1 +++ b/tests/windows/integration/test_reconfig_start_stop.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function setUpScript { Write-Host "Resetting environment: " -NoNewline diff --git a/tests/windows/integration/test_remove.ps1 b/tests/windows/integration/test_remove.ps1 index 779b4ba..74dc0a8 100644 --- a/tests/windows/integration/test_remove.ps1 +++ b/tests/windows/integration/test_remove.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - function setUpScript { Write-Host "Resetting environment: " -NoNewline diff --git a/tests/windows/integration/test_upgrade.ps1 b/tests/windows/integration/test_upgrade.ps1 index 1e18c82..231b8ad 100644 --- a/tests/windows/integration/test_upgrade.ps1 +++ b/tests/windows/integration/test_upgrade.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - $start_ver = "3006.0" $upgrade_ver = "3006.1" diff --git a/tests/windows/runtests.ps1 b/tests/windows/runtests.ps1 index ddcb473..72b3ea3 100644 --- a/tests/windows/runtests.ps1 +++ b/tests/windows/runtests.ps1 @@ -1,6 +1,3 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. -# SPDX-License-Identifier: Apache-2 - <# .SYNOPSIS Script for running tests for the VMtools Windows salt-minion script diff --git a/windows/svtminion.ps1 b/windows/svtminion.ps1 index fc595d0..bc94c22 100644 --- a/windows/svtminion.ps1 +++ b/windows/svtminion.ps1 @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved. +# Copyright (c) 2021-2026 Broadcom Inc. All Rights Reserved. # SPDX-License-Identifier: Apache-2 <#