Merge pull request #44 from Noahnc/fix/changelog_with_tile_constraint

Fix/changelog_with_tile_constraint
Noahnc · Dec 9, 2023 · bbc6171 · bbc6171
2 parents 2500bf3 + b104b91
commit bbc6171
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/infrapatch/action/__main__.py b/infrapatch/action/__main__.py
@@ -114,6 +114,9 @@ def get_pr_body(provider_handler: ProviderHandler) -> str:
             body += markdown_tables[provider_name].dumps()
             body += "\n"
         if provider_name in release_notes:
+            if len(release_notes[provider_name]) == 0:
+                log.debug(f"No release notes found for provider '{provider_name}'.")
+                continue
             log.debug(f"Adding release notes for provider '{provider_name}' to pull request body.")
             body += "## Changelog\n"
             for release_note in release_notes[provider_name]:

diff --git a/infrapatch/core/providers/terraform/base_terraform_provider.py b/infrapatch/core/providers/terraform/base_terraform_provider.py
@@ -106,7 +106,7 @@ def get_resource_release_notes(self, resource: VersionedTerraformResource) -> Un
             return None
         try:
             repo = self._github.get_repo(resource.github_repo)
-            release_notes = repo.get_release(f"v{resource.newest_version}").body
+            release_notes = repo.get_release(f"v{resource.newest_version_base}").body
         except Exception as e:
             log.warning(f"Could not get release notes from repo '{resource.github_repo}' for version '{resource.newest_version}': {e}")
             return None

diff --git a/infrapatch/core/utils/terraform/registry_handler.py b/infrapatch/core/utils/terraform/registry_handler.py
@@ -116,7 +116,7 @@ def get_source(self, resource: VersionedTerraformResource) -> Union[str, None]:
             return cache.source
 
         base_endpoint, registry_base_domain = self._compose_base_url(resource)
-        version_info_endpoint = f"{base_endpoint}/{resource.newest_version}"
+        version_info_endpoint = f"{base_endpoint}/{resource.newest_version_base}"
         try:
             response = self._send_request(version_info_endpoint, registry_base_domain)
         except TerraformRegistryException as e:

diff --git a/tf_test_files/project2/meta.tf b/tf_test_files/project2/meta.tf
@@ -1,8 +1,12 @@
 terraform {
   required_providers {
     azurerm = {
-      source  = "hashicorp/azuread"
+      source  = "hashicorp/azurerm"
       version = "0.0.1"
     }
+    azuread = {
+      source  = "hashicorp/azuread"
+      version = "~>1.1.0"
+    }
   }
 }