Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved.
# SPDX-License-Identifier: Apache-2

.idea
*.un~
/build
Expand Down
3 changes: 0 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions linux/svtminion.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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 '$?'";
Expand Down
3 changes: 0 additions & 3 deletions tests/linux/test-linux.sh
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 0 additions & 2 deletions tests/windows/functional/test_clear_logs.ps1
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_config.ps1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_download.ps1
Original file line number Diff line number Diff line change
@@ -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)"

Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_existing_salt.ps1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_get_filehash.ps1
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_get_isreparsepoint.ps1
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_get_salt_package_info.ps1
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_main.ps1
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_new_secure_directory.ps1
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_parse_config.ps1
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_path.ps1
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_random_id.ps1
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_remove_file_or_folder.ps1
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_secure_owner.ps1
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_security.ps1
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_service.ps1
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_status.ps1
Original file line number Diff line number Diff line change
@@ -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 `
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/functional/test_version.ps1
Original file line number Diff line number Diff line change
@@ -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 ) {
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/helpers.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved.
# SPDX-License-Identifier: Apache-2

function Write-Header {
[CmdletBinding()]
param(
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/integration/test_clear.ps1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/integration/test_install_exact_ver.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved.
# SPDX-License-Identifier: Apache-2

$test_version = "3006.9"

function setUpScript {
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/integration/test_install_latest.ps1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/integration/test_install_major.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# Copyright (c) 2021-2025 Broadcom Inc. All Rights Reserved.
# SPDX-License-Identifier: Apache-2

$test_version = "3006"

function setUpScript {
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/integration/test_reconfig_start_stop.ps1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/integration/test_remove.ps1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions tests/windows/integration/test_upgrade.ps1
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
3 changes: 0 additions & 3 deletions tests/windows/runtests.ps1
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion windows/svtminion.ps1
Original file line number Diff line number Diff line change
@@ -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

<#
Expand Down
Loading