Merge parent into osp trunk

.github/CODEOWNERS

@@ -0,0 +1,9 @@
+# This file registers ownership for certain parts of the Cloud Carbon Footprint code
+# Review from a member of the maintanence team or other designated owner is required for merging pull requests
+# The last matching pattern takes precedence
+# <https://help.github.com/articles/about-codeowners/>
+
+*                       @cloud-carbon-footprint/maintainers
+/microsite/*            @cloud-carbon-footprint/maintainers @ericksod
+/*.md                   @cloud-carbon-footprint/maintainers @ericksod
+packages/*              @cloud-carbon-footprint/maintainers

.github/workflows/ci.yml

@@ -59,9 +59,9 @@ jobs:
           bash <(curl -s https://codecov.io/bash) -f packages/aws/coverage/* -F aws
           bash <(curl -s https://codecov.io/bash) -f packages/gcp/coverage/* -F gcp
           bash <(curl -s https://codecov.io/bash) -f packages/azure/coverage/* -F azure
-      - name: integration tests
-        run: yarn test:integration
-        continue-on-error: true # Temporarily allow continue on failure till we've seen the tests consistently pass on CI
+#      - name: integration tests
+#        run: yarn test:integration
+#        continue-on-error: true # Temporarily allow continue on failure till we've seen the tests consistently pass on CI
   build:
     needs: lint-test
     runs-on: ubuntu-latest

.github/workflows/demo-app.yml

@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   deploy-demo-app:
-    if: github.event.pull_request.head.ref == 'changeset-release/trunk'
+    if: github.event_name == 'workflow_dispatch' || github.event.pull_request.head.ref == 'changeset-release/trunk'
     runs-on: ubuntu-latest
     container:
       image: node:16.19-alpine3.17
@@ -24,7 +24,7 @@ jobs:
     steps:
       # Fetch and checkout the repo
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
       # Run Yarn Install in the Client Package
@@ -39,6 +39,7 @@ jobs:
           REACT_APP_PREVIOUS_YEAR_OF_USAGE: ${{ secrets.REACT_APP_PREVIOUS_YEAR_OF_USAGE }}
           REACT_APP_GROUP_BY: ${{ secrets.REACT_APP_GROUP_BY }}
           REACT_APP_MINIMAL_DATE_AGE: ${{ secrets.REACT_APP_MINIMAL_DATE_AGE }}
+          REACT_APP_DISABLE_FORECAST_VALIDATION: ${{ secrets.REACT_APP_DISABLE_FORECAST_VALIDATION }}
         run: |
           cd packages/client
           ./create_client_env_file.sh
@@ -70,7 +71,8 @@ jobs:
           mkdir packages/client/stub-server/api
           mkdir packages/client/stub-server/api/regions
 
-          node scripts/create-client-mock-data.js
+          #  Updates the timestamps and values of the mock data files (usually for the forecast data)
+          node scripts/create-mock-data.js
 
           # Copy static build files to demo Google Cloud Bucket
           gsutil cp -r packages/client/build/* gs://${GOOGLE_DEMO_STORAGE_BUCKET}

.husky/pre-commit

@@ -4,13 +4,13 @@
 branch="$(git rev-parse --abbrev-ref HEAD)"
 root=$( git diff --pretty="" --name-only --staged -- packages/ | wc -l )
 
-if [[ "$branch" != "changeset-release/trunk" ]]; then
+if [ "$branch" != "changeset-release/trunk" ]; then
     if [ ! -t 1 ]; then
         export TALISMAN_INTERACTIVE="false"
     fi
 
     ./scripts/copyright_check.sh && ./scripts/branch_warning.sh && $TALISMAN_HOME/talisman_hook_script pre-commit || exit 1
-    if [[ "$root" -gt "0" ]]; then
+    if [ "$root" -gt "0" ]; then
         echo 'Detecting modified files in packages directory...'
         yarn lerna run precommit --stream
     fi

.talismanrc

@@ -97,8 +97,12 @@ fileignoreconfig:
   checksum: bd3ecff05d1290b7f7d0a4ba4267c3f34037b52aa82f13c31e35ca8803103b9b
 - filename: docker/nginx.conf
   checksum: a4632d785a11f199217d4229a40eba5a38180d9945d96799dc9b5efc6a3bc06e
+- filename: microsite/blog/2023-08-23-ccf-on-vm.md
+  checksum: 84e94d40daf06c50f7b0e26d8d73a300d967279a87612e991e417530bfb8774c
 - filename: microsite/docs/ClassifyingUsageTypes.md
   checksum: f4b232851337efec90c4a88271cdf4cde2a9d732f0f69824223f1dcf7c6b8aaa
+- filename: microsite/docs/ConfigurationOptions/PerformanceConsiderations.md
+  checksum: f98b207c28550e3f44b27a47ebb0a5553c28318edaaf2f490ba94856a082badb
 - filename: microsite/docs/CreatingALookupTable.md
   checksum: 71905a04532ef57e9eab56fefd1c1e43dfd48fabb928a044bbb7c5100640fe5c
 - filename: microsite/docs/EmbodiedEmissions.md
@@ -113,22 +117,30 @@ fileignoreconfig:
   checksum: 4271fca662d95372f0f1439c4a5f82424a06e2c38790a8806e1031dc74387016
 - filename: package.json
   checksum: ba58128b0b71af8219a05b5cf27fcad837639fdb85c8846be7ef8248b5124f1c
+- filename: packages/ali/src/__tests__/AliCostAndUsageService.test.ts
+  checksum: 5f7313007ca6a4eae2a608faa11dbb0be97712371703b618e28093138a345363
+- filename: packages/ali/src/lib/AliCalculateRow.ts
+  checksum: 77997e1e88c3fe9bbafbda63d4c1c9b83df439417664cf0d080488b01c8c0c51
 - filename: packages/api/.env.template
-  checksum: ec94dc4f50d599e64405562c74b0ba2d1f49781dba1d0fbc9f5011eeea7e2101
+  checksum: 024d92688cbbca7a345f9c9ee53e86d377ec6df92ddb746dce90c57b2a5c988f
+- filename: packages/api/CHANGELOG.md
+  checksum: 70538ae254f51f772d64e42ddb9f2c6393fc49969ea0be0cc5c91a6447204032
 - filename: packages/api/create_docker_secrets.sh
-  checksum: c34b49c2f48a01a21f5a86bc2cc76980231d780fb884d5b829dc595c9ba6d9dd
+  checksum: 61bf83f49efc9578228e8136896e957d0f6a50d62034413f1173e41f10304b83
 - filename: packages/api/create_server_env_file.sh
   checksum: b6a9b46936e31ca0690ea2fc7080f4c6b5eac0e807c6a71e9dabc13ff8a2d026
 - filename: packages/api/estimates.cache-uscs.json
   checksum: 0ed3196623ac3ad3ec034c0694c8e0c525549e0b362719808fd21d3ed9d11cba
 - filename: packages/api/estimates.cache.test.json
   checksum: 47701f39ac93d11ebf30ebc3eb7499971094144b82bbd558aebdaa551d8228f3
 - filename: packages/api/mock-estimates.json
-  checksum: 8e9863c48edd5fb60fd4cb2085f466884b231105bdeb16619fdb72ad63598253
+  checksum: 1a811c04be292f000abe28d55a30aa3fc37bd4891e1ecfef8a9122e256f87a06
 - filename: packages/api/package.json
   checksum: 3fd7ec81bfa309f1d01ae0eadb695a418850e671d148715ae4259e14706491f5
 - filename: packages/api/src/api.test.ts
   checksum: 860db73e7ff2f960dd5de86d49d09d629fdaccba4b1c85724dace7efd5791943
+- filename: packages/app/CHANGELOG.md
+  checksum: 55548743013fe54dcb1b59e301992d92326b18ee9f74a71d1ceff6af13818aeb
 - filename: packages/app/src/Cache.ts
   checksum: e1ebd94bd8b823c4c3e94a547bceb82d1f37f73c03cdf5d32fd4f9c1effff68e
 - filename: packages/app/src/CreateValidRequest.ts
@@ -170,15 +182,19 @@ fileignoreconfig:
 - filename: packages/azure/package.json
   checksum: 5059b9e6c08f6482b208ff4a5c3189873868a82cabdd4a089d7efe64eafd004a
 - filename: packages/azure/src/__tests__/AzureAccount.test.ts
-  checksum: aaae306bc2bf8a39f34e31f41e7e7c9fd98321fcefc72aca0e126500446ccbfb
+  checksum: b1a4309f63a2831c0664290f2ee6c4dbbb7cc3b3eb7ed1288ad0a8abadd3b452
 - filename: packages/azure/src/__tests__/AzureCredentialsProvider.test.ts
   checksum: 4719d9bfa50789868066ca218f2202a316aaa70904a4152c2a5dfde80f11ba80
 - filename: packages/azure/src/__tests__/ConsumptionManagement.test.ts
   checksum: 68f9a8c23d08e892511e99356f39c010b8e8959fd012aaa51e999cd51e51181b
+- filename: packages/azure/src/application/AzureCredentialsProvider.ts
+  checksum: 08ea921d8cf6e05dd55183b8c9c338dee64bcb3a77d875c276455f79e3034c4e
 - filename: packages/azure/src/lib/ConsumptionManagement.ts
   checksum: 42fc6ed4df06fb61f5077f3192d8b8aa8162016621da79f369247fac612afbd6
 - filename: packages/cli/.env.template
-  checksum: 698cfcaab558a76335309ee251a2180312cdf93214c371afe0dc6f8254ccd7b6
+  checksum: e3d3b374e2680bc5f346eb243c96ec94ca7e08e449a1cbc5e6cf9561490d7082
+- filename: packages/cli/CHANGELOG.md
+  checksum: 21834ba3691c0d05ea8d60ccaae74695a0e7a1f73c762d2692a5e2e2bb7c5c93
 - filename: packages/cli/src/CreateLookupTable/createAzureInput.ts
   checksum: b5deddd45ffaceb0ff503797a3a6401541821fee39cb8d6a48601c971fce4566
 - filename: packages/cli/src/CreateLookupTable/createLookupTable.ts
@@ -195,6 +211,8 @@ fileignoreconfig:
   checksum: 89d6331e5be615cc6caefb8537aab159edaf16ca4f19efaaf38c411b667285a6
 - filename: packages/client/create_client_env_file.sh
   checksum: 2ebf0978d768edd6423a9f5f3b0f3fcdbe2c484d69152c6125575ff93e9708f4
+- filename: packages/client/src/Config.ts
+  checksum: a1c04f96a9be8e217e535f25a61a5cae1c40933129a05dac81243bb2caa92c60
 - filename: packages/client/src/common/FilterBar/FilterBar.tsx
   checksum: 0005b5abc9cba50b821c955aa1cc28e9860d4c8748f52c3bf6927eef620500fc
 - filename: packages/client/src/common/FilterBar/utils/DropdownConstants.test.ts
@@ -279,10 +297,16 @@ fileignoreconfig:
   checksum: 6c6198c36a6276699d141dd125eb8d8f247f7dc41cc27078332791d50d9a1074
 - filename: packages/client/stub-server/footprint.json
   checksum: 2a1551ebe105d866d121c17029d53c7466b67e2cfc1c71b13b5894ae5bc06b50
+- filename: packages/client/stub-server/mockData.json
+  checksum: c0e961bc6f9750fb6d304ef1e5650024454d327690a2755da61b755bdf166a85
 - filename: packages/client/stub-server/recommendations.json
   checksum: fd9afa539a5991cb21416293ae9d17a57005b5bcacdd148fe9f4ce0fd3de145e
 - filename: packages/common/src/Config.ts
   checksum: 8cde1d40a5a56e3f1454534817d254a7b61baf2d28e185bf0c5093d8320c8b85
+- filename: packages/common/src/EmissionsFactors.ts
+  checksum: e28dbaf55e4a2a02ec43a1adfad5b060774a5dcd1c872b9bb5e28727e26f8de7
+- filename: packages/common/src/__tests__/EmissionsFactors.test.ts
+  checksum: b513f4119cae71648485f3f3d6795f1062f361f45028deaddfa506132a0a49cb
 - filename: packages/core/package.json
   checksum: c0f3b35fe6ca5f0bb14a34ccda0ed917ed97c03b116190210f4da82628891706
 - filename: packages/core/src/CloudConstantsTypes.ts
@@ -315,10 +339,12 @@ fileignoreconfig:
   checksum: 39e68fa8eeb0706e881d900f8cf69d9859131b087b1555a51015faded40f6504
 - filename: packages/core/src/unknown/UnknownEstimator.ts
   checksum: 4033fa577fb1b42245c0471ce7da72f76713d394370a17695c022eb22ca7c42c
+- filename: packages/create-app/CHANGELOG.md
+  checksum: a64d71c2fc2e45bccba7b7bdb9bcac70825eb78882799e789c130b60cae4558e
 - filename: packages/create-app/templates/default-app/packages/api/.env.template
   checksum: 6a3a9348d74dd6df5978cc0aa6a2fa0c5b51cb62484735614eb5338ccdb6458e
 - filename: packages/create-app/templates/default-app/packages/cli/.env.template
-  checksum: 7663594e66cc73a1906c4195e8860d3bec17d17ce3a582d2095638702dda9db4
+  checksum: 5445657c548050959e00d0b6ea0c05551679bf9b4f2bc3859d6f4fbb1501de37
 - filename: packages/create-app/templates/default-app/packages/cli/src/GuidedInstall/aws.ts
   checksum: 402853f10d9ee56006cea9b63d6ec8d34d6eed506addf89d048d3072069d9f7b
 - filename: packages/create-app/templates/default-app/packages/cli/src/GuidedInstall/azure.ts
@@ -351,12 +377,14 @@ fileignoreconfig:
   checksum: 99c4532676af436031037ef8794891a85cc7a6bb306491f7d96339f91c5fccf5
 - filename: packages/create-app/templates/default-app/packages/client/src/utils/helpers/transformData.ts
   checksum: 0d806eb083f87fba89e6cf56744269e50c76d2fd4a096a30f8ab7d16fcdcb991
+- filename: packages/create-app/templates/default-app/packages/client/stub-server/mockData.json
+  checksum: 9073338cab91e48f6b789c52f415d8559926d791d80aeb2954cb2fb842202a66
 - filename: packages/gcp/src/__tests__/BillingExportTable.test.ts
-  checksum: 806ca071f5f496e5bd682f0474543f9b6e6c7f5d687e8db89cf244371393188f
+  checksum: 50397c9013f12b8b9cc457ffdeee4e5796edf2175dccc2c3aef7c7016c6fb144
 - filename: packages/gcp/src/__tests__/GCPAccount.test.ts
   checksum: 26ef0caf65177a4e013ecff94012824cee58ceed48c09b29f7710712084ab9c4
 - filename: packages/gcp/src/lib/BillingExportTable.ts
-  checksum: df8f16310cd2bf983821666d495f5bf1945584851e1242e37ecdf0a652102113
+  checksum: 96f2b97dfa7265469d3a6958aac504414c2f298bd214364d925b3c0b65efa2a7
 - filename: packages/gcp/src/lib/BillingExportTypes.ts
   checksum: 27e7319ef9204e0c6e575ddf8bf288d2627fb8542f468ddde86439420be8c93d
 - filename: packages/gcp/src/lib/MachineTypes.ts

ADOPTERS.md

@@ -1,5 +1,9 @@
+© 2021 Thoughtworks, Inc.
+
 | Organization                                 | Contact  (github handle or other)                                                                                                                                                                                        | Description of Use                                                                                                                                                                                                                           |
 |----------------------------------------------| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [Thoughtworks](https://www.thoughtworks.com) | green-cloud@thoughtworks.com                                                                                                                                                                                 | Measure and reduce cloud carbon emissions for Thoughtworks. Deployed internally on GCP. Expanding feature set and refining methodology.                                                                                                      |
 | [OSP](https://www.osp.de/en)                 | ccf@osp.de                                                                                                                                                                                                   | Measure and reduce cloud carbon emissions for OSP. The tool is part of the tool infrastructure of the OSP Sustainable Programming Initiative (SPI). The tool is part of a strategy to  become more energy efficient with our cloud projects. |
+|[Climatiq](https://www.climatiq.io/) |   hello@climatiq.io  | Measure the embodied and use-phase cloud emissions of GCP, AZURE, and AWS. |
 |                                              |                                                                                                                                                                                                              |                                                                                                                                                                                                                                              |
+|[PITS Global Data Recovery Services](https://www.pitsdatarecovery.net/) | [@pheianox](https://github.com/pheianox) | Analytics and effective integration with other cloud providers |

docker-compose.yml

@@ -30,7 +30,13 @@ services:
       - AZURE_CLIENT_ID
       - AZURE_CLIENT_SECRET
       - AZURE_TENANT_ID
+      - MONGODB_URI
+      - MONGODB_CREDENTIALS
+      # uncomment to define this as the certificate file for your MongoDB
+      #- x509-cert-mongodb.pem
     environment:
+      # set the CACHE_MODE to MONGODB to use MongoDB
+      - CACHE_MODE=LOCAL
       - AWS_USE_BILLING_DATA=true
       - AWS_TARGET_ACCOUNT_ROLE_NAME=/run/secrets/AWS_TARGET_ACCOUNT_ROLE_NAME
       - AWS_ATHENA_DB_NAME=/run/secrets/AWS_ATHENA_DB_NAME
@@ -49,7 +55,10 @@ services:
       - AZURE_CLIENT_ID=/run/secrets/AZURE_CLIENT_ID
       - AZURE_CLIENT_SECRET=/run/secrets/AZURE_CLIENT_SECRET
       - AZURE_TENANT_ID=/run/secrets/AZURE_TENANT_ID
-
+      # uncomment to enable MongoDB
+      #- MONGODB_URI=/run/secrets/MONGODB_URI
+      #- MONGODB_CREDENTIALS=/run/secrets/MONGODB_CREDENTIALS
+      #- x509-cert-mongodb.pem=/run/secrets/x509-cert-mongodb.pem
 secrets:
   AWS_TARGET_ACCOUNT_ROLE_NAME:
     file: ~/.docker/secrets/AWS_TARGET_ACCOUNT_ROLE_NAME
@@ -77,3 +86,10 @@ secrets:
     file: ~/.docker/secrets/AZURE_CLIENT_SECRET
   AZURE_TENANT_ID:
     file: ~/.docker/secrets/AZURE_TENANT_ID
+  MONGODB_URI:
+    file: ~/.docker/secrets/MONGODB_URI
+  MONGODB_CREDENTIALS:
+    file: ~/.docker/secrets/MONGODB_CREDENTIALS
+  # uncomment to refer to your MongoDB cert file
+  #x509-cert-mongodb.pem:
+  #  file: ~/.docker/secrets/x509-cert-mongodb.pem

footprint-test.http

@@ -0,0 +1,3 @@
+GET http://127.0.0.1:4000/api/footprint?start=2022-07-01&end=2022-07-02&ignoreCache=true&groupBy=day&limit=1000&skip=0
+
+Accept: application/json, text/plain, */*