diff --git a/charon/cache.py b/charon/cache.py index 0112d5fe..1dc84e5c 100644 --- a/charon/cache.py +++ b/charon/cache.py @@ -12,10 +12,10 @@ DEFAULT_BUCKET_TO_DOMAIN = { "prod-maven-ga": "maven.repository.redhat.com", "prod-maven-ea": "maven.repository.redhat.com", - "stage-maven-ga": "maven.strage.repository.redhat.com", - "stage-maven-ea": "maven.strage.repository.redhat.com", - "prod-npm": "npm.repository.redhat.com", - "stage-npm": "npm.stage.repository.redhat.com" + "stage-maven-ga": "maven.stage.repository.redhat.com", + "stage-maven-ea": "maven.stage.repository.redhat.com", + "prod-npm": "npm.registry.redhat.com", + "stage-npm": "npm.stage.registry.redhat.com" } @@ -117,7 +117,7 @@ def check_invalidation(self, distr_id: str, invalidation_id: str) -> dict: invalidation = response.get('Invalidation', {}) return { 'Id': invalidation.get('Id', None), - 'CreateTime': invalidation.get('CreateTime', None), + 'CreateTime': str(invalidation.get('CreateTime', None)), 'Status': invalidation.get('Status', None) } except Exception as err: diff --git a/charon/cmd/cmd_cache.py b/charon/cmd/cmd_cache.py index 4aaedacb..e63bf222 100644 --- a/charon/cmd/cmd_cache.py +++ b/charon/cmd/cmd_cache.py @@ -123,7 +123,7 @@ def cf_invalidate( ) else: invalidate_cf_paths( - cf_client, b, work_paths, b, batch_size=3000 + cf_client, b, work_paths, batch_size=3000 ) except Exception: print(traceback.format_exc()) diff --git a/charon/schemas/charon.json b/charon/schemas/charon.json index d7850fad..f6a931d1 100644 --- a/charon/schemas/charon.json +++ b/charon/schemas/charon.json @@ -52,6 +52,10 @@ "registry": { "description": "npm registry", "type": "string" + }, + "domain": { + "description": "domain name for bucket", + "type": "string" } }, "required": [