address comments

Author: sabrina-datadog

Dockerfiles/agent/windows/README.md

@@ -6,7 +6,7 @@ How to build the Agent docker image
 From the root of the repository, run the following command:
 
 ```
-docker run --rm -it -v "${pwd}:c:\mnt" -e OMNIBUS_TARGET=main -e MAJOR_VERSION=7 -e PY_RUNTIMES=3 datadog/agent-buildimages-windows_x64:1809 powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1 -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1"
+docker run --rm -it -v "${pwd}:c:\mnt" -e OMNIBUS_TARGET=main -e MAJOR_VERSION=7 datadog/agent-buildimages-windows_x64:1809 powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1 -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1"
 ```
 
 The build artifacts will be in `omnibus\pkg`.

tasks/libs/releasing/json.py

@@ -67,7 +67,7 @@ def _get_jmxfetch_release_json_info(release_json):
     Gets the JMXFetch version info from the previous entries in the release.json file.
     """
 
-    release_json_version_data = _get_release_json_info_for_next_rc(release_json)
+    release_json_version_data = release_json[RELEASE_JSON_DEPENDENCIES]
 
     jmxfetch_version = release_json_version_data['JMXFETCH_VERSION']
     jmxfetch_shasum = release_json_version_data['JMXFETCH_HASH']
@@ -81,7 +81,7 @@ def _get_windows_release_json_info(release_json):
     """
     Gets the Windows NPM driver info from the previous entries in the release.json file.
     """
-    release_json_version_data = _get_release_json_info_for_next_rc(release_json)
+    release_json_version_data = release_json[RELEASE_JSON_DEPENDENCIES]
 
     win_ddnpm_driver, win_ddnpm_version, win_ddnpm_shasum = _get_windows_driver_info(release_json_version_data, 'DDNPM')
     win_ddprocmon_driver, win_ddprocmon_version, win_ddprocmon_shasum = _get_windows_driver_info(
@@ -118,14 +118,6 @@ def _get_windows_driver_info(release_json_version_data, driver_name):
     return driver_value, version_value, shasum_value
 
 
-def _get_release_json_info_for_next_rc(release_json):
-    """
-    Gets the version info from the previous entries in the release.json file.
-    """
-
-    return release_json[RELEASE_JSON_DEPENDENCIES]
-
-
 ##
 ## release_json object update function
 ##

tasks/libs/releasing/version.py

@@ -249,18 +249,17 @@ def _get_release_version_from_release_json(release_json, version_re, release_jso
     release_component_version = None
     dependencies_entry = release_json.get(RELEASE_JSON_DEPENDENCIES, None)
 
-    if not dependencies_entry:
+    if dependencies_entry is None:
         raise Exit(f"release.json is missing a {RELEASE_JSON_DEPENDENCIES} entry.", 1)
 
     # Check that the component's version is defined in the dependencies entry
-    if release_json_key is not None:
-        match = version_re.match(dependencies_entry.get(release_json_key, ""))
-        if match:
-            release_component_version = _create_version_from_match(match)
-        else:
-            print(
-                f"{RELEASE_JSON_DEPENDENCIES} does not have a valid {release_json_key} ({dependencies_entry.get(release_json_key, '')}), ignoring"
-            )
+    match = version_re.match(dependencies_entry.get(release_json_key, ""))
+    if match:
+        release_component_version = _create_version_from_match(match)
+    else:
+        print(
+            f"{RELEASE_JSON_DEPENDENCIES} does not have a valid {release_json_key} ({dependencies_entry.get(release_json_key, '')}), ignoring"
+        )
 
     return release_component_version