Merge pull request #1036 from Green-Software-Foundation/fix-manifests

Fix output manifests to run with if-check
Green-Software-Foundation · Oct 4, 2024 · dd172d5 · dd172d5
2 parents 5982794 + d0894b6
commit dd172d5
Show file tree

Hide file tree

Showing 18 changed files with 449 additions and 268 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/...me-sync/failure-missing-global-config.yml → ...tins/time-sync/failure-missing-config.yml b/...me-sync/failure-missing-global-config.yml → ...tins/time-sync/failure-missing-config.yml
@@ -5,30 +5,25 @@ initialize:
   output:
     - yaml
   plugins:
-    "time-sync":
+    'time-sync':
       method: TimeSync
-      path: "builtin"
-      config:
-        # start-time: '2023-12-12T00:00:00.000Z'
-        # end-time: '2023-12-12T00:01:00.000Z'
-        # interval: 5
-        # allow-padding: true
+      path: 'builtin'
 tree:
   children:
     child:
       pipeline:
         compute:
           - time-sync
       inputs:
-        - timestamp: "2023-12-12T00:00:00.000Z"
+        - timestamp: '2023-12-12T00:00:00.000Z'
           duration: 3
           energy-cpu: 0.001
-        - timestamp: "2023-12-12T00:00:01.000Z"
+        - timestamp: '2023-12-12T00:00:01.000Z'
           duration: 5
           energy-cpu: 0.001
-        - timestamp: "2023-12-12T00:00:06.000Z"
+        - timestamp: '2023-12-12T00:00:06.000Z'
           duration: 7
           energy-cpu: 0.001
-        - timestamp: "2023-12-12T00:00:13.000Z"
+        - timestamp: '2023-12-12T00:00:13.000Z'
           duration: 30
           energy-cpu: 0.001
diff --git a/manifests/examples/builtins/time-sync/success.yml b/manifests/examples/builtins/time-sync/success.yml
@@ -5,12 +5,12 @@ initialize:
   output:
     - yaml
   plugins:
-    "time-sync":
+    'time-sync':
       method: TimeSync
-      path: "builtin"
+      path: 'builtin'
       config:
-        start-time: "2023-12-12T00:00:00.000Z"
-        end-time: "2023-12-12T00:01:00.000Z"
+        start-time: '2023-12-12T00:00:00.000Z'
+        end-time: '2023-12-12T00:01:00.000Z'
         interval: 5
         allow-padding: true
 tree:
@@ -20,15 +20,15 @@ tree:
         compute:
           - time-sync
       inputs:
-        - timestamp: "2023-12-12T00:00:00.000Z"
+        - timestamp: '2023-12-12T00:00:00.000Z'
           duration: 1
           energy-cpu: 0.001
-        - timestamp: "2023-12-12T00:00:01.000Z"
+        - timestamp: '2023-12-12T00:00:01.000Z'
           duration: 5
           energy-cpu: 0.001
-        - timestamp: "2023-12-12T00:00:06.000Z"
+        - timestamp: '2023-12-12T00:00:06.000Z'
           duration: 7
           energy-cpu: 0.001
-        - timestamp: "2023-12-12T00:00:13.000Z"
+        - timestamp: '2023-12-12T00:00:13.000Z'
           duration: 30
           energy-cpu: 0.001
diff --git a/manifests/outputs/bugs/aggregation-error-wrong-metric.yaml b/manifests/outputs/bugs/aggregation-error-wrong-metric.yaml
@@ -19,7 +19,7 @@ initialize:
           - 10
           - 50
           - 100
-        "y":
+        'y':
           - 0.12
           - 0.32
           - 0.75
@@ -83,34 +83,33 @@ initialize:
       method: TimeSync
       path: builtin
       config:
-        start-time: "2023-12-12T00:00:00.000Z"
-        end-time: "2023-12-12T00:01:00.000Z"
+        start-time: '2023-12-12T00:00:00.000Z'
+        end-time: '2023-12-12T00:01:00.000Z'
         interval: 5
         allow-padding: true
 execution:
   status: fail
   command: >-
-    /Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
-    /Users/mariamkhalatova/Projects/UK/if/src/index.ts -m
-    manifests/outputs/bugs/aggregation-error-wrong-metric.yml -o
-    manifests/outputs/bugs/aggregation-error-wrong-metric
+    /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
+    /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m
+    manifests/outputs/bugs/aggregation-error-wrong-metric.yaml
   environment:
-    if-version: 0.4.0
+    if-version: 0.6.0
     os: macOS
-    os-version: "13.2"
-    node-version: 18.14.2
-    date-time: 2024-07-01T19:25:34.759Z (UTC)
+    os-version: 14.6.1
+    node-version: 18.20.4
+    date-time: 2024-10-04T08:38:25.343Z (UTC)
     dependencies:
-      - "@babel/[email protected]"
-      - "@babel/[email protected]"
-      - "@commitlint/[email protected]"
-      - "@commitlint/[email protected]"
-      - "@grnsft/[email protected].10"
-      - "@jest/[email protected]"
-      - "@types/[email protected]"
-      - "@types/[email protected]"
-      - "@types/[email protected]"
-      - "@types/[email protected]"
+      - '@babel/[email protected]'
+      - '@babel/[email protected]'
+      - '@commitlint/[email protected]'
+      - '@commitlint/[email protected]'
+      - '@grnsft/[email protected].25'
+      - '@jest/[email protected]'
+      - '@types/[email protected]'
+      - '@types/[email protected]'
+      - '@types/[email protected]'
+      - '@types/[email protected]'
       - [email protected]
       - [email protected]
       - [email protected]
@@ -130,9 +129,10 @@ execution:
       - [email protected]
       - [email protected]
       - [email protected]
-      - zod@3.22.4
+      - zod@3.23.8
   error: >-
-    MissingInputDataError: `functional-unit` value is missing from input data or it is not a positive integer
+    MissingAggregationParamError: Aggregation metric dummy-param is not found in
+    inputs[0].
 tree:
   children:
     child-1:
@@ -160,25 +160,25 @@ tree:
         vcpus-allocated: 1
         vcpus-total: 8
       inputs:
-        - timestamp: "2023-12-12T00:00:00.000Z"
+        - timestamp: '2023-12-12T00:00:00.000Z'
           cloud/instance-type: A1
           cloud/region: uk-west
           duration: 1
           cpu/utilization: 10
           requests: 100
-        - timestamp: "2023-12-12T00:00:01.000Z"
+        - timestamp: '2023-12-12T00:00:01.000Z'
           duration: 5
           cpu/utilization: 20
           cloud/instance-type: A1
           cloud/region: uk-west
           requests: 100
-        - timestamp: "2023-12-12T00:00:06.000Z"
+        - timestamp: '2023-12-12T00:00:06.000Z'
           duration: 7
           cpu/utilization: 15
           cloud/instance-type: A1
           cloud/region: uk-west
           requests: 100
-        - timestamp: "2023-12-12T00:00:13.000Z"
+        - timestamp: '2023-12-12T00:00:13.000Z'
           duration: 30
           cloud/instance-type: A1
           cloud/region: uk-west
@@ -209,25 +209,25 @@ tree:
         vcpus-allocated: 1
         vcpus-total: 8
       inputs:
-        - timestamp: "2023-12-12T00:00:00.000Z"
+        - timestamp: '2023-12-12T00:00:00.000Z'
           duration: 1
           cpu/utilization: 30
           cloud/instance-type: A1
           cloud/region: uk-west
           requests: 100
-        - timestamp: "2023-12-12T00:00:01.000Z"
+        - timestamp: '2023-12-12T00:00:01.000Z'
           duration: 5
           cpu/utilization: 28
           cloud/instance-type: A1
           cloud/region: uk-west
           requests: 100
-        - timestamp: "2023-12-12T00:00:06.000Z"
+        - timestamp: '2023-12-12T00:00:06.000Z'
           duration: 7
           cpu/utilization: 40
           cloud/instance-type: A1
           cloud/region: uk-west
           requests: 100
-        - timestamp: "2023-12-12T00:00:13.000Z"
+        - timestamp: '2023-12-12T00:00:13.000Z'
           duration: 30
           cpu/utilization: 33
           cloud/instance-type: A1

diff --git a/manifests/outputs/bugs/sci-embodied-missing-resources-total.yaml b/manifests/outputs/bugs/sci-embodied-missing-resources-total.yaml
diff --git a/manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml b/manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml
@@ -1,7 +1,6 @@
 name: sci-embodied
 description: >-
-  failure with `defaults.device/emissions-embodied` being string instead of
-  number
+  failure with `vCPUs` being string instead of number
 tags: null
 initialize:
   plugins:
@@ -11,28 +10,26 @@ initialize:
 execution:
   status: fail
   command: >-
-    /Users/mariamkhalatova/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
-    /Users/mariamkhalatova/Projects/UK/if/src/index.ts -m
-    manifests/outputs/plugins/sci-embodied/failure-invalid-default-emission-value.yml
-    -o
-    manifests/outputs/plugins/sci-embodied/failure-invalid-default-emission-value
+    /Users/manushak/.npm/_npx/1bf7c3c15bf47d04/node_modules/.bin/ts-node
+    /Users/manushak/Documents/Projects/Green-Software/if/src/if-run/index.ts -m
+    manifests/outputs/builtins/sci-embodied/failure-invalid-default-emission-value.yaml
   environment:
-    if-version: 0.4.0
+    if-version: 0.6.0
     os: macOS
-    os-version: "13.2"
-    node-version: 18.14.2
-    date-time: 2024-07-02T20:49:08.280Z (UTC)
+    os-version: 14.6.1
+    node-version: 18.20.4
+    date-time: 2024-10-04T08:59:52.608Z (UTC)
     dependencies:
-      - "@babel/[email protected]"
-      - "@babel/[email protected]"
-      - "@commitlint/[email protected]"
-      - "@commitlint/[email protected]"
-      - "@grnsft/[email protected].10"
-      - "@jest/[email protected]"
-      - "@types/[email protected]"
-      - "@types/[email protected]"
-      - "@types/[email protected]"
-      - "@types/[email protected]"
+      - '@babel/[email protected]'
+      - '@babel/[email protected]'
+      - '@commitlint/[email protected]'
+      - '@commitlint/[email protected]'
+      - '@grnsft/[email protected].25'
+      - '@jest/[email protected]'
+      - '@types/[email protected]'
+      - '@types/[email protected]'
+      - '@types/[email protected]'
+      - '@types/[email protected]'
       - [email protected]
       - [email protected]
       - [email protected]
@@ -52,20 +49,19 @@ execution:
       - [email protected]
       - [email protected]
       - [email protected]
-      - zod@3.22.4
+      - zod@3.23.8
   error: >-
-    InputValidationError: "device/emissions-embodied" parameter is invalid
-    number. please provide it as `gco2e` to input. Error code: invalid_union.
+    InputValidationError: "vCPUs" parameter is expected number, received string
+    at index 0. Error code: invalid_type.
 tree:
   children:
     child:
       pipeline:
         compute:
           - sci-embodied
       defaults:
-        device/emissions-embodied: fail
+        vCPUs: fail
         time-reserved: 3600
-        device/expected-lifespan: 94608000
         resources-reserved: 1
         resources-total: 8
       inputs: