Add indicator_prefix param to archiver params

qx-teo · qx-teo · commit 1bdca5fcab61 · 2021-08-06T16:21:17.000-04:00
Required, currently manually provided in https://github.com/cmu-delphi/covidcast-indicators/blob/0943e38f4a7e5a33d521f0f807313059f4c8e300/jhu/delphi_jhu/run.py#L97. needed to be provided to avoid https://github.com/cmu-delphi/covidcast-indicators/blob/f83033786a912c475e53654a2bc58c2d067e2727/_delphi_utils_python/delphi_utils/archive.py#L143
diff --git a/ansible/templates/jhu-params-prod.json.j2 b/ansible/templates/jhu-params-prod.json.j2
@@ -44,6 +44,7 @@
       "aws_secret_access_key": "{{ delphi_aws_secret_access_key }}"
     },
     "bucket_name": "delphi-covidcast-indicator-output",
-    "cache_dir": "./cache"
+    "cache_dir": "./cache",
+    "indicator_prefix": "jhu"
   }
 }
diff --git a/jhu/params.json.template b/jhu/params.json.template
@@ -38,5 +38,14 @@
         "deaths_7dav_incidence_num",
         "deaths_7dav_incidence_prop"]
     }
+  },
+  "archive": {
+    "aws_credentials": {
+      "aws_access_key_id": "",
+      "aws_secret_access_key": ""
+    },
+    "bucket_name": "",
+    "cache_dir": "./cache",
+    "indicator_prefix": "jhu"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@`
`44`	`44`	`"aws_secret_access_key": "{{ delphi_aws_secret_access_key }}"`
`45`	`45`	`},`
`46`	`46`	`"bucket_name": "delphi-covidcast-indicator-output",`
`47`		`- "cache_dir": "./cache"`
	`47`	`+ "cache_dir": "./cache",`
	`48`	`+ "indicator_prefix": "jhu"`
`48`	`49`	`}`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,14 @@`
`38`	`38`	`"deaths_7dav_incidence_num",`
`39`	`39`	`"deaths_7dav_incidence_prop"]`
`40`	`40`	`}`
	`41`	`+ },`
	`42`	`+ "archive": {`
	`43`	`+ "aws_credentials": {`
	`44`	`+ "aws_access_key_id": "",`
	`45`	`+ "aws_secret_access_key": ""`
	`46`	`+ },`
	`47`	`+ "bucket_name": "",`
	`48`	`+ "cache_dir": "./cache",`
	`49`	`+ "indicator_prefix": "jhu"`
`41`	`50`	`}`
`42`	`51`	`}`