From 9bf352fd7b3d2a3e37d55cfc1b902e36a54d9feb Mon Sep 17 00:00:00 2001 From: Twangboy Date: Tue, 1 Sep 2026 13:27:43 -0600 Subject: [PATCH] Update stale vmware.com references to broadcom.com VMware's acquisition by Broadcom left dead/broken documentation links and stale email addresses scattered across the repo. Fix the ones that are actually broken and drop the ones that no longer make sense to keep, verifying each replacement URL resolves before landing it: - Replace dead VMware doc links (vSphere Web Services API reference pages, ESXCLI docs, the Tanzu/VMware Salt product page, the privacy policy link) with their current broadcom.com/developer.broadcom.com/ techdocs.broadcom.com equivalents. - Drop a dead 2012 VMware blog link and a dead VMware Flings deep link, keeping the surrounding explanatory text. - Strip personal @vmware.com addresses from :codeauthor: docstring attributions, keeping the author names. - Switch the packaging automation email used in changelog generation and most CI workflows to saltproject.pdl@broadcom.com going forward. Historical changelog/spec entries are left untouched as a record of what was true at the time. release.yml, which GPG-signs commits/ tags, keeps the old saltproject-packaging@vmware.com identity until it's confirmed the signing key has a UID for the new address, so we don't lose GitHub's commit verification. - Rename the changelog-author string in tools/changelog.py from "Salt Project Packaging" to "Salt Project", since there's no longer a separate packaging distro. Left as-is everywhere the name is tied to git config, to keep this change scoped to non-git-signing metadata. Regenerated .github/workflows/{ci,nightly,scheduled,staging}.yml via the generate-workflows pre-commit hook. Refs #70202 --- .github/workflows/ci.yml | 2 +- .github/workflows/depcheck.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/scheduled.yml | 2 +- .github/workflows/staging.yml | 2 +- .github/workflows/templates/ci.yml.jinja | 2 +- README.rst | 4 ++-- SUPPORT.rst | 2 +- changelog/70202.fixed.md | 16 ++++++++++++++++ doc/_themes/saltstack2/layout.html | 2 +- doc/topics/cloud/vmware.rst | 10 +++++----- salt/modules/vsphere.py | 7 +++---- salt/proxy/esxi.py | 7 +++---- salt/states/esxi.py | 4 +--- salt/utils/vmware.py | 13 +++++++------ .../functional/modules/test_mac_brew_pkg.py | 2 +- .../integration/cli/test_salt_deltaproxy.py | 2 +- tests/pytests/unit/grains/test_core.py | 2 +- tests/pytests/unit/grains/test_metadata.py | 2 +- tests/pytests/unit/grains/test_metadata_azure.py | 2 +- tests/pytests/unit/grains/test_metadata_gce.py | 2 +- tests/pytests/unit/modules/napalm/test_mod.py | 2 +- tests/pytests/unit/modules/test_beacons.py | 2 +- tests/pytests/unit/modules/test_mongodb.py | 2 +- tests/pytests/unit/modules/test_textfsm_mod.py | 2 +- tests/pytests/unit/modules/test_zypperpkg.py | 2 +- tests/pytests/unit/pillar/test_etcd_pillar.py | 2 +- tests/pytests/unit/returners/test_etcd_return.py | 2 +- .../pytests/unit/states/file/test_mod_beacon.py | 2 +- tests/pytests/unit/states/test_etcd_mod.py | 2 +- tests/pytests/unit/states/test_schedule.py | 2 +- tests/pytests/unit/states/test_service.py | 2 +- tools/changelog.py | 8 ++++---- tools/pkg/__init__.py | 2 +- 34 files changed, 67 insertions(+), 54 deletions(-) create mode 100644 changelog/70202.fixed.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8cff776140d2..82078c448994 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -341,7 +341,7 @@ jobs: if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} run: | git config --global user.name "Salt Project Packaging" - git config --global user.email saltproject-packaging@vmware.com + git config --global user.email saltproject.pdl@broadcom.com - name: Setup Pre-Commit if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} diff --git a/.github/workflows/depcheck.yml b/.github/workflows/depcheck.yml index 92389846b6be..436167767150 100644 --- a/.github/workflows/depcheck.yml +++ b/.github/workflows/depcheck.yml @@ -352,7 +352,7 @@ jobs: if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} run: | git config --global user.name "Salt Project Packaging" - git config --global user.email saltproject-packaging@vmware.com + git config --global user.email saltproject.pdl@broadcom.com - name: Setup Pre-Commit if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e3ad230ccb66..b74f3428e641 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -405,7 +405,7 @@ jobs: if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} run: | git config --global user.name "Salt Project Packaging" - git config --global user.email saltproject-packaging@vmware.com + git config --global user.email saltproject.pdl@broadcom.com - name: Setup Pre-Commit if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index dc9526ba27da..7b5869a196a3 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -390,7 +390,7 @@ jobs: if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} run: | git config --global user.name "Salt Project Packaging" - git config --global user.email saltproject-packaging@vmware.com + git config --global user.email saltproject.pdl@broadcom.com - name: Setup Pre-Commit if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index c87d3abc9269..928147c098de 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -364,7 +364,7 @@ jobs: if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} run: | git config --global user.name "Salt Project Packaging" - git config --global user.email saltproject-packaging@vmware.com + git config --global user.email saltproject.pdl@broadcom.com - name: Setup Pre-Commit if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 6d07d1e49640..f8324b7323f3 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -154,7 +154,7 @@ if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} run: | git config --global user.name "Salt Project Packaging" - git config --global user.email saltproject-packaging@vmware.com + git config --global user.email saltproject.pdl@broadcom.com - name: Setup Pre-Commit if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} diff --git a/README.rst b/README.rst index 68da809e2145..691fb5af61a5 100644 --- a/README.rst +++ b/README.rst @@ -69,7 +69,7 @@ In addition to configuration management Salt can also: About our sponsors ================== -Salt powers VMware by Broadcom's `Tanzu Salt`_ +Salt powers VMware by Broadcom's `VMware Salt`_ (previously Aria Automation Config / vRealize Automation SaltStack Config / SaltStack Enterprise), and can be found under the hood of products from Juniper, Cisco, Cloudflare, Nutanix, SUSE, and Tieto, to name a few. @@ -178,7 +178,7 @@ A complete list of attributions and dependencies can be found here: `salt/DEPENDENCIES.md `_ .. _Salt Project Community Discord: https://discord.com/invite/J7b7EscrAs -.. _Tanzu Salt: https://www.vmware.com/products/app-platform/tanzu-salt +.. _VMware Salt: https://techdocs.broadcom.com/us/en/vmware-cis/other/vmware-salt/8-18.html .. _Latest Salt Documentation: https://docs.saltproject.io/en/latest/ .. _Open an issue: https://github.com/saltstack/salt/issues/new/choose .. _SECURITY.md: https://github.com/saltstack/salt/blob/master/SECURITY.md diff --git a/SUPPORT.rst b/SUPPORT.rst index 54b81d8881bf..6d808313f0d2 100644 --- a/SUPPORT.rst +++ b/SUPPORT.rst @@ -22,4 +22,4 @@ guidelines for filing bug reports: **Salt Project Support** - If you need dedicated, prioritized support, please consider taking a look at the Enterprise product: -`Tanzu Salt `__ +`VMware Salt `__ diff --git a/changelog/70202.fixed.md b/changelog/70202.fixed.md new file mode 100644 index 000000000000..c92ced6f5200 --- /dev/null +++ b/changelog/70202.fixed.md @@ -0,0 +1,16 @@ +Updated stale ``vmware.com`` references left over from the VMware acquisition by Broadcom: + +- Replaced dead/broken VMware documentation links (vSphere API reference pages, ESXCLI docs, + the Tanzu/VMware Salt product page, the privacy policy link) with their current + ``broadcom.com``/``developer.broadcom.com``/``techdocs.broadcom.com`` equivalents. +- Removed a dead 2012 VMware blog link and a dead VMware Flings deep link, keeping the + surrounding explanatory text. +- Removed personal ``@vmware.com`` addresses from ``:codeauthor:`` docstring attributions, + keeping the author names. +- Switched the packaging automation email used in changelog generation and most CI workflows to + ``saltproject.pdl@broadcom.com`` going forward (historical changelog/spec entries are left + untouched as a record of what was true at the time). The release workflow, which GPG-signs + commits/tags, keeps ``saltproject-packaging@vmware.com`` until it's confirmed the signing key + has a UID for the new address, to avoid losing GitHub's commit verification. +- In ``tools/changelog.py``, also renamed the changelog author from ``Salt Project Packaging`` to + ``Salt Project`` (there's no longer a separate packaging distro). diff --git a/doc/_themes/saltstack2/layout.html b/doc/_themes/saltstack2/layout.html index ef99aa2ebbd1..6aaa6868511b 100644 --- a/doc/_themes/saltstack2/layout.html +++ b/doc/_themes/saltstack2/layout.html @@ -265,7 +265,7 @@

saltproject.io

-

© {{ copyright }} VMware, Inc. | Privacy Policy

+

© {{ copyright }} VMware, Inc. | Privacy Policy

diff --git a/doc/topics/cloud/vmware.rst b/doc/topics/cloud/vmware.rst index e58b9b7ff909..fd55a20cff02 100644 --- a/doc/topics/cloud/vmware.rst +++ b/doc/topics/cloud/vmware.rst @@ -542,7 +542,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or Specify the guest id of the VM. For a full list of supported values see the VMware vSphere documentation: - https://code.vmware.com/apis?pid=com.vmware.wssdk.apiref.doc&release=vsphere-60&topic=vim.vm.GuestOsDescriptor.GuestOsIdentifier.html + https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html .. note:: @@ -566,19 +566,19 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or Specify windows vm user's organization. Default organization name is Organization VMware vSphere documentation: - https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.UserData.html + https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.customization.UserData.html ``win_user_fullname`` Specify windows vm user's fullname. Default fullname is "Windows User" VMware vSphere documentation: - https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.UserData.html + https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.customization.UserData.html ``plain_text`` Flag to specify whether or not the password is in plain text, rather than encrypted. VMware vSphere documentation: - https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.Password.html + https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.customization.Password.html ``win_installer`` Specify windows minion client installer path @@ -586,7 +586,7 @@ Set up an initial profile at ``/etc/salt/cloud.profiles`` or ``win_run_once`` Specify a list of commands to run on first login to a windows minion - https://www.vmware.com/support/developer/vc-sdk/visdk25pubs/ReferenceGuide/vim.vm.customization.GuiRunOnce.html + https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/vim.vm.customization.GuiRunOnce.html ``verify_ssl`` Verify the vmware ssl certificate. The default is True. diff --git a/salt/modules/vsphere.py b/salt/modules/vsphere.py index 35cec024f0aa..4307d69dd59e 100644 --- a/salt/modules/vsphere.py +++ b/salt/modules/vsphere.py @@ -97,7 +97,7 @@ Please see the `vSphere Comparison`_ page for more information. -.. _vSphere Comparison: https://www.vmware.com/products/vsphere/compare +.. _vSphere Comparison: https://www.vmware.com/products/vsphere.html#compare About @@ -1260,8 +1260,6 @@ def set_syslog_config( use for logging. Multiple log servers can be specified by listing them, comma-separated, but without spaces before or after commas. - (reference: https://blogs.vmware.com/vsphere/2012/04/configuring-multiple-syslog-servers-for-esxi-5.html) - protocol Optionally set to alternate protocol if the host is not using the default protocol. Default protocol is ``https``. @@ -8115,7 +8113,8 @@ def add_host_to_dvs( to vSphere, this will fail with an unhelpful "busy" error. There is, however, a Powershell PowerCLI cmdlet called Add-VDSwitchPhysicalNetworkAdapter - that does what we want. I used Onyx (https://labs.vmware.com/flings/onyx) + that does what we want. I used Onyx (search for it at + https://community.broadcom.com/flings/home) to sniff the SOAP stream from Powershell to our vSphere server and got this snippet out: diff --git a/salt/proxy/esxi.py b/salt/proxy/esxi.py index a7f6b1e90e44..c01dcb679c91 100644 --- a/salt/proxy/esxi.py +++ b/salt/proxy/esxi.py @@ -72,11 +72,10 @@ the ESXCLI package be installed on the machine running the Proxy Minion process. The ESXCLI package is also referred to as the VMware vSphere CLI, or vCLI. VMware -provides vCLI package installation instructions for `vSphere 5.5`_ and -`vSphere 6.0`_. +provides the `ESXCLI command reference`_ for current installation and usage +instructions. -.. _vSphere 5.5: http://pubs.vmware.com/vsphere-55/index.jsp#com.vmware.vcli.getstart.doc/cli_install.4.2.html -.. _vSphere 6.0: http://pubs.vmware.com/vsphere-60/index.jsp#com.vmware.vcli.getstart.doc/cli_install.4.2.html +.. _ESXCLI command reference: https://developer.broadcom.com/xapis/esxcli-command-reference/latest/ Once all of the required dependencies are in place and the vCLI package is installed, you can check to see if you can connect to your ESXi host or vCenter diff --git a/salt/states/esxi.py b/salt/states/esxi.py index b817f91a1d74..b9c9e12d9fa0 100644 --- a/salt/states/esxi.py +++ b/salt/states/esxi.py @@ -83,7 +83,7 @@ Please see the `vSphere Comparison`_ page for more information. -.. _vSphere Comparison: https://www.vmware.com/products/vsphere/compare +.. _vSphere Comparison: https://www.vmware.com/products/vsphere.html#compare About ----- @@ -949,8 +949,6 @@ def syslog_configured( logging. Multiple log servers can be specified by listing them, comma-separated, but without spaces before or after commas - (reference: https://blogs.vmware.com/vsphere/2012/04/configuring-multiple-syslog-servers-for-esxi-5.html) - firewall Enable the firewall rule set for syslog. Defaults to ``True``. diff --git a/salt/utils/vmware.py b/salt/utils/vmware.py index f2401c788aee..181d7fde5c09 100644 --- a/salt/utils/vmware.py +++ b/salt/utils/vmware.py @@ -53,11 +53,10 @@ writing, no other functions in this module rely on ESXCLI. The ESXCLI package is also referred to as the VMware vSphere CLI, or vCLI. VMware -provides vCLI package installation instructions for `vSphere 5.5`_ and -`vSphere 6.0`_. +provides the `ESXCLI command reference`_ for current installation and usage +instructions. -.. _vSphere 5.5: http://pubs.vmware.com/vsphere-55/index.jsp#com.vmware.vcli.getstart.doc/cli_install.4.2.html -.. _vSphere 6.0: http://pubs.vmware.com/vsphere-60/index.jsp#com.vmware.vcli.getstart.doc/cli_install.4.2.html +.. _ESXCLI command reference: https://developer.broadcom.com/xapis/esxcli-command-reference/latest/ Once all of the required dependencies are in place and the vCLI package is installed, you can check to see if you can connect to your ESXi host or vCenter @@ -905,8 +904,10 @@ def get_content( """ Returns the content of the specified type of object for a Service Instance. - For more information, please see: - http://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.pg.doc_50%2FPG_Ch5_PropertyCollector.7.6.html + For more information, please see the ``PropertyCollector`` reference in the + `vSphere Web Services API`_ documentation. + + .. _vSphere Web Services API: https://developer.broadcom.com/xapis/vsphere-web-services-api/latest/ service_instance The Service Instance from which to obtain content. diff --git a/tests/pytests/functional/modules/test_mac_brew_pkg.py b/tests/pytests/functional/modules/test_mac_brew_pkg.py index 7c2f372deaba..eb4fed25fdda 100644 --- a/tests/pytests/functional/modules/test_mac_brew_pkg.py +++ b/tests/pytests/functional/modules/test_mac_brew_pkg.py @@ -1,6 +1,6 @@ """ :codeauthor: Nicole Thomas - :codeauthor: Gareth J. Greenaway + :codeauthor: Gareth J. Greenaway """ import pytest diff --git a/tests/pytests/integration/cli/test_salt_deltaproxy.py b/tests/pytests/integration/cli/test_salt_deltaproxy.py index 8c04fc2f61ac..cf6707455a63 100644 --- a/tests/pytests/integration/cli/test_salt_deltaproxy.py +++ b/tests/pytests/integration/cli/test_salt_deltaproxy.py @@ -1,5 +1,5 @@ """ -:codeauthor: Gareth J. Greenaway (ggreenaway@vmware.com) +:codeauthor: Gareth J. Greenaway """ import logging diff --git a/tests/pytests/unit/grains/test_core.py b/tests/pytests/unit/grains/test_core.py index 00e3ea4f5ee8..a4110f0824bf 100644 --- a/tests/pytests/unit/grains/test_core.py +++ b/tests/pytests/unit/grains/test_core.py @@ -3,7 +3,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ :codeauthor: Erik Johnson - :codeauthor: David Murphy + :codeauthor: David Murphy """ import errno diff --git a/tests/pytests/unit/grains/test_metadata.py b/tests/pytests/unit/grains/test_metadata.py index 84f32b08fe60..dd67a988ff10 100644 --- a/tests/pytests/unit/grains/test_metadata.py +++ b/tests/pytests/unit/grains/test_metadata.py @@ -24,7 +24,7 @@ ``latest/api/token`` on that 401, caches the token in ``__context__``, and sends it with every subsequent metadata query. -:codeauthor: :email: `Gareth J. Greenaway ` +:codeauthor: Gareth J. Greenaway """ import logging diff --git a/tests/pytests/unit/grains/test_metadata_azure.py b/tests/pytests/unit/grains/test_metadata_azure.py index 4f9bc9988a79..9d77db49a526 100644 --- a/tests/pytests/unit/grains/test_metadata_azure.py +++ b/tests/pytests/unit/grains/test_metadata_azure.py @@ -2,7 +2,7 @@ Unit test for salt.grains.metadata_azure - :codeauthor: :email" `Vishal Gupta + :codeauthor: Vishal Gupta """ diff --git a/tests/pytests/unit/grains/test_metadata_gce.py b/tests/pytests/unit/grains/test_metadata_gce.py index 9148b65853b9..27795dcee08d 100644 --- a/tests/pytests/unit/grains/test_metadata_gce.py +++ b/tests/pytests/unit/grains/test_metadata_gce.py @@ -2,7 +2,7 @@ Unit test for salt.grains.metadata_gce - :codeauthor: :email" `Thomas Phipps + :codeauthor: Thomas Phipps """ diff --git a/tests/pytests/unit/modules/napalm/test_mod.py b/tests/pytests/unit/modules/napalm/test_mod.py index 2ea1a14a4518..28622a8fc85d 100644 --- a/tests/pytests/unit/modules/napalm/test_mod.py +++ b/tests/pytests/unit/modules/napalm/test_mod.py @@ -1,5 +1,5 @@ """ - :codeauthor: :email:`David Murphy ` + :codeauthor: David Murphy """ import logging diff --git a/tests/pytests/unit/modules/test_beacons.py b/tests/pytests/unit/modules/test_beacons.py index 7d3d9346bb82..3ab7f4344ed9 100644 --- a/tests/pytests/unit/modules/test_beacons.py +++ b/tests/pytests/unit/modules/test_beacons.py @@ -1,5 +1,5 @@ """ - :codeauthor: :email:`Gareth J. Greenaway ` + :codeauthor: Gareth J. Greenaway """ import logging diff --git a/tests/pytests/unit/modules/test_mongodb.py b/tests/pytests/unit/modules/test_mongodb.py index 37bf432af25c..331734be3239 100644 --- a/tests/pytests/unit/modules/test_mongodb.py +++ b/tests/pytests/unit/modules/test_mongodb.py @@ -1,5 +1,5 @@ """ - :codeauthor: Gareth J. Greenaway + :codeauthor: Gareth J. Greenaway """ import pytest diff --git a/tests/pytests/unit/modules/test_textfsm_mod.py b/tests/pytests/unit/modules/test_textfsm_mod.py index e158c55b7195..248766dea30a 100644 --- a/tests/pytests/unit/modules/test_textfsm_mod.py +++ b/tests/pytests/unit/modules/test_textfsm_mod.py @@ -1,5 +1,5 @@ """ - :codeauthor: Gareth J. Greenaway + :codeauthor: Gareth J. Greenaway """ import pytest diff --git a/tests/pytests/unit/modules/test_zypperpkg.py b/tests/pytests/unit/modules/test_zypperpkg.py index 4a6357cc753b..f1ba6c474bca 100644 --- a/tests/pytests/unit/modules/test_zypperpkg.py +++ b/tests/pytests/unit/modules/test_zypperpkg.py @@ -1,5 +1,5 @@ """ - :codeauthor: Gareth J. Greenaway + :codeauthor: Gareth J. Greenaway """ import os diff --git a/tests/pytests/unit/pillar/test_etcd_pillar.py b/tests/pytests/unit/pillar/test_etcd_pillar.py index ec08616e17c2..1a2ff0292b6b 100644 --- a/tests/pytests/unit/pillar/test_etcd_pillar.py +++ b/tests/pytests/unit/pillar/test_etcd_pillar.py @@ -1,7 +1,7 @@ """ Test cases for salt.pillar.etcd_pillar - :codeauthor: Caleb Beard + :codeauthor: Caleb Beard """ import pytest diff --git a/tests/pytests/unit/returners/test_etcd_return.py b/tests/pytests/unit/returners/test_etcd_return.py index 6d4920519b36..0391b2ee0afd 100644 --- a/tests/pytests/unit/returners/test_etcd_return.py +++ b/tests/pytests/unit/returners/test_etcd_return.py @@ -1,7 +1,7 @@ """ Test cases for salt.returners.etcd_return - :codeauthor: Caleb Beard + :codeauthor: Caleb Beard """ import copy diff --git a/tests/pytests/unit/states/file/test_mod_beacon.py b/tests/pytests/unit/states/file/test_mod_beacon.py index 512e55094b58..c007fc0f1fd7 100644 --- a/tests/pytests/unit/states/file/test_mod_beacon.py +++ b/tests/pytests/unit/states/file/test_mod_beacon.py @@ -1,5 +1,5 @@ """ - :codeauthor: Gareth J. Greenaway + :codeauthor: Gareth J. Greenaway """ import pytest diff --git a/tests/pytests/unit/states/test_etcd_mod.py b/tests/pytests/unit/states/test_etcd_mod.py index 17df492a1c0a..5c8b9f0eacbf 100644 --- a/tests/pytests/unit/states/test_etcd_mod.py +++ b/tests/pytests/unit/states/test_etcd_mod.py @@ -6,7 +6,7 @@ If the contents of this state were to add more logic besides essentially acting as a wrapper, then functional tests would be required. - :codeauthor: Caleb Beard + :codeauthor: Caleb Beard """ import pytest diff --git a/tests/pytests/unit/states/test_schedule.py b/tests/pytests/unit/states/test_schedule.py index 7abefb56d32c..52aa62ba8e00 100644 --- a/tests/pytests/unit/states/test_schedule.py +++ b/tests/pytests/unit/states/test_schedule.py @@ -1,6 +1,6 @@ """ :codeauthor: Jayesh Kariya - :codeauthor: Gareth J. Greenaway + :codeauthor: Gareth J. Greenaway """ from collections import OrderedDict diff --git a/tests/pytests/unit/states/test_service.py b/tests/pytests/unit/states/test_service.py index 3314b23d79ab..99cea163aa98 100644 --- a/tests/pytests/unit/states/test_service.py +++ b/tests/pytests/unit/states/test_service.py @@ -1,5 +1,5 @@ """ - :codeauthor: Gareth J. Greenaway + :codeauthor: Gareth J. Greenaway """ import logging diff --git a/tools/changelog.py b/tools/changelog.py index 20d71ce5bb67..18aac306d39d 100644 --- a/tools/changelog.py +++ b/tools/changelog.py @@ -109,7 +109,9 @@ def update_rpm(ctx: Context, salt_version: Version, draft: bool = False): ).stdout.decode() dt = datetime.datetime.utcnow() date = dt.strftime("%a %b %d %Y") - header = f"* {date} Salt Project Packaging - {str_salt_version}\n" + header = ( + f"* {date} Salt Project - {str_salt_version}\n" + ) parts = orig.split("%changelog") tmpspec = "pkg/rpm/salt.spec.1" with open(tmpspec, "w", encoding="utf-8") as wfp: @@ -158,9 +160,7 @@ def update_deb(ctx: Context, salt_version: Version, draft: bool = False): with open(tmp_debian_changelog_path, "w", encoding="utf-8") as wfp: wfp.write(f"salt ({salt_version}) stable; urgency=medium\n\n") wfp.write(formated) - wfp.write( - f"\n -- Salt Project Packaging {date}\n\n" - ) + wfp.write(f"\n -- Salt Project {date}\n\n") with open(debian_changelog_path, encoding="utf-8") as rfp: wfp.write(rfp.read()) try: diff --git a/tools/pkg/__init__.py b/tools/pkg/__init__.py index b66a6a786572..88277ddb29a5 100644 --- a/tools/pkg/__init__.py +++ b/tools/pkg/__init__.py @@ -487,7 +487,7 @@ def pypi_upload(ctx: Context, files: list[pathlib.Path], test: bool = False): def configure_git( ctx: Context, user: str = "Salt Project Packaging", - email: str = "saltproject-packaging@vmware.com", + email: str = "saltproject.pdl@broadcom.com", ): cwd = pathlib.Path.cwd() ctx.info("Setting name and email in git global config")