Change pageSize value equal to totalCount (#145)

* Fix extension not found due to page size limit

Author: Dysio

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.6.8
+current_version = 1.6.9
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>.*))?
 serialize = 
 	{major}.{minor}.{patch}-{release}

Makefile

@@ -8,6 +8,7 @@ lint: setup
 .venv: poetry.lock
 	python -m venv .venv
 	poetry install
+	touch .venv
 
 type-check: setup
 	#poetry run mypy --strict dtcli/scripts/dt.py

dtcli/api.py

@@ -41,6 +41,11 @@ def acquire_environment_configuration(self, fqdn: str):
 
     def acquire_extensions(self):
         r = self.requests.get(f"{self.url_base}/api/v2/extensions", headers=self.headers)
+        # Temporary solution. It can cause too much data usage.
+        # Also we can hit a hard backend limit wrg to page size.
+        # Which can cause false negatives.
+        ext_num_tot = r.json()["totalCount"]
+        r = self.requests.get(f"{self.url_base}/api/v2/extensions?pageSize={ext_num_tot}", headers=self.headers)
         r.raise_for_status()
         return r.json()["extensions"]
 
@@ -113,9 +118,10 @@ def download_schemas(self, target_version: str, download_dir: str):
 
         header = self.headers
         header["accept"] = "application/octet-stream"
-        file = self.requests.get(self.url_base + f"/api/v2/extensions/schemas/{version}", headers=header, stream=True)
-        file.raise_for_status()
-        zfile = zipfile.ZipFile(io.BytesIO(file.content))
+        schema_file = self.requests.get(self.url_base + f"/api/v2/extensions/schemas/{version}",
+                                        headers=header, stream=True)
+        schema_file.raise_for_status()
+        zfile = zipfile.ZipFile(io.BytesIO(schema_file.content))
 
         THRESHOLD_ENTRIES = 10000
         THRESHOLD_SIZE = 1000000000

dtcli/delete_extension.py

@@ -58,11 +58,6 @@ def acquire_state(client: DynatraceAPIClient) -> State:
 
 
 def acquire_state_for_extension(client: DynatraceAPIClient, extension: str) -> State:
-    extensions_listing = list(map(lambda e: e["extensionName"], client.acquire_extensions()))
-
-    if extension not in extensions_listing:
-        raise Exception("Extension doesn't exist")
-
     versions = client.acquire_extension_versions(extension)
     # TODO: is this really any?
     extension_data: Dict[str, Dict[str, Any]] = defaultdict(dict)

dtcli/scripts/dt.py

@@ -784,7 +784,13 @@ def delete(**kwargs):
     Example: custom:com.dynatrace.extension.extension-name
     """
     token = kwargs["api_token_path"]
-    delete_extension.wipe(fqdn=kwargs["extension"], tenant=kwargs["tenant_url"], token=token)
+    try:
+        delete_extension.wipe(fqdn=kwargs["extension"], tenant=kwargs["tenant_url"], token=token)
+    except requests.exceptions.HTTPError as err:
+        if err.response.status_code == 404:
+            raise click.BadParameter(err, param_hint="EXTENSION")
+        else:
+            raise
 
 
 @extension.command(

dtcli/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.6.8"
+__version__ = "1.6.9"

pyproject.toml

@@ -12,7 +12,7 @@ packages = [
 ]
 readme = "README.md"
 repository = "https://github.com/dynatrace-oss/dt-cli"
-version = "1.6.8"
+version = "1.6.9"
 
 
 [tool.poetry.dependencies]