vars

dumasd · Sep 27, 2024 · 886ad55 · 886ad55
1 parent 0e4646e
commit 886ad55
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/ops/api/nacos.py b/ops/api/nacos.py
@@ -52,7 +52,7 @@ class GetChangeSetSchema(Schema):
     changeLogFile = fields.Str(required=True)
     count = fields.Int(required=False)
     contexts = fields.Str(required=False)
-    vairables = fields.Dict()
+    vars = fields.Dict()
 
 
 class ApplyChangeSetSchema(Schema):
@@ -319,23 +319,19 @@ def get_change_set():
     )
     count = data.get("count", 0)
     contexts = data.get("contexts")
-    vairables = data.get("vairables", {})
+    vars = data.get("vars", {})
 
     try:
         nacosChangeLog = NacosChangeLog(changelogFile=data["changeLogFile"])
-        result = nacosChangeLog.fetch_multi(
-            client, nacos_id, count, contexts, vairables
-        )
+        result = nacosChangeLog.fetch_multi(client, nacos_id, count, contexts, vars)
         keys = ["ids", "changes"]
         return dict(zip(keys, result))
     except jsonschema.ValidationError as err:
         logger.error("Invalid changelog file", exc_info=True)
-        return make_response(
-            f"Invalid changelog file. {err}", 400
-        )
+        return make_response(f"Invalid changelog file. {err}", 400)
     except KeyError as err:
-        logger.error("Vairables missing key", exc_info=True)
-        return make_response(f"Vairables missing key: {err}", 400)
+        logger.error("Vars missing key", exc_info=True)
+        return make_response(f"Vars missing key: {err}", 400)
 
 
 @bp.route("/nacos/v1/apply_change_set", methods=["POST"])

diff --git a/ops/changelog/nacos_change.py b/ops/changelog/nacos_change.py
@@ -240,7 +240,7 @@ def fetch_multi(
         nacos_id: str,
         count: int = 0,
         contexts: str = None,
-        vairables: dict = {},
+        vars: dict = {},
     ):
         """
         获取多个当前需要执行的changeset
@@ -302,13 +302,13 @@ def fetch_multi(
                     logger.info(f"current change: {change}")
 
                     namespaceTemplate = string.Template(change["namespace"])
-                    namespace = namespaceTemplate.substitute(vairables)
+                    namespace = namespaceTemplate.substitute(vars)
 
                     groupTemplate = string.Template(change["group"])
-                    group = groupTemplate.substitute(vairables)
+                    group = groupTemplate.substitute(vars)
 
                     dataIdTemplate = string.Template(change["dataId"])
-                    dataId = dataIdTemplate.substitute(vairables)
+                    dataId = dataIdTemplate.substitute(vars)
 
                     format = change["format"]