Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/prod-beta' into prod-stable
Browse files Browse the repository at this point in the history
  • Loading branch information
@dlabrecq
dlabrecq committed Aug 28, 2023
2 parents b0f98ad + a153f09 commit af0edf1
Show file tree
Hide file tree
Showing 88 changed files with 4,087 additions and 2,534 deletions.
0 ...s/components/dataToolbar/workloadType.tsx → ...s/components/dataToolbar/workloadType.tsx
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions .eslintrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@
"react/prop-types": 0,
"simple-import-sort/imports": "error",
"spaced-comment": "error",
"testing-library/await-async-query": "error",
"testing-library/no-await-sync-query": "error",
"testing-library/await-async-queries": "error",
"testing-library/no-await-sync-queries": "error",
"testing-library/no-debugging-utils": "warn",
"testing-library/no-dom-import": "off",
"use-isnan": "error"
Expand Down
36 changes: 36 additions & 0 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
def secrets = [
[path: params.VAULT_PATH_SVC_ACCOUNT_EPHEMERAL, engineVersion: 1, secretValues: [
[envVar: 'OC_LOGIN_TOKEN_DEV', vaultKey: 'oc-login-token-dev'],
[envVar: 'OC_LOGIN_SERVER_DEV', vaultKey: 'oc-login-server-dev']]],
[path: params.VAULT_PATH_QUAY_PUSH, engineVersion: 1, secretValues: [
[envVar: 'QUAY_USER', vaultKey: 'user'],
[envVar: 'QUAY_TOKEN', vaultKey: 'token']]],
[path: params.VAULT_PATH_RHR_PULL, engineVersion: 1, secretValues: [
[envVar: 'RH_REGISTRY_USER', vaultKey: 'user'],
[envVar: 'RH_REGISTRY_TOKEN', vaultKey: 'token']]]
]

def configuration = [vaultUrl: params.VAULT_ADDRESS, vaultCredentialId: params.VAULT_CREDS_ID, engineVersion: 1]

pipeline {
agent { label 'hccm' }
options {
timestamps()
}

environment {
FEO_CONTAINER_NAME="hccm-frontend-pr-check-pipeline-$ghprbPullId"
}

stages {
stage('PR Checks') {
steps {
withVault([configuration: configuration, vaultSecrets: secrets]) {
sh '''
source ./pr_check.sh
'''
}
}
}
}
}
202 changes: 185 additions & 17 deletions locales/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@
"costCategoryDesc": [
{
"type": 0,
"value": "Enable your data source labels to be used as AWS category keys for report grouping and filtering. Changes will be reflected within 24 hours. "
"value": "Enable your AWS cost categories to be used for report grouping and filtering. Changes will be reflected within 24 hours. "
},
{
"type": 1,
Expand Down Expand Up @@ -1261,7 +1261,7 @@
"costModelsDesc": [
{
"type": 0,
"value": "Associate a price to metrics provided by your sources to charge for utilization of resources. "
"value": "Cost models can help you analyze and predict future costs. Associate a price to metrics provided by your sources to calculate your charges for resource usage. "
},
{
"type": 1,
Expand Down Expand Up @@ -1376,10 +1376,10 @@
"value": "Should not exceed 100 characters"
}
],
"costModelsLastChange": [
"costModelsLastUpdated": [
{
"type": 0,
"value": "Last change"
"value": "Last updated"
}
],
"costModelsPopover": [
Expand Down Expand Up @@ -1854,7 +1854,7 @@
"costTypeSettingsDesc": [
{
"type": 0,
"value": "Select the preferred way to calculating upfront costs, either through savings plans or subscription fees. This feature is available for Amazon Web Services cost only."
"value": "Select the preferred way of calculating upfront costs of savings plans or subscription fees. This feature is available for Amazon Web Services cost only."
}
],
"costTypeSettingsLabel": [
Expand Down Expand Up @@ -3296,6 +3296,12 @@
"value": "Disable tags"
}
],
"disabled": [
{
"type": 0,
"value": "Disabled"
}
],
"discountMinus": [
{
"type": 0,
Expand Down Expand Up @@ -6928,7 +6934,7 @@
"value": [
{
"type": 0,
"value": "Input for name name"
"value": "Input for name"
}
]
},
Expand Down Expand Up @@ -6963,7 +6969,7 @@
"value": [
{
"type": 0,
"value": "Input for service_name name"
"value": "Input for service_name"
}
]
},
Expand Down Expand Up @@ -7003,7 +7009,15 @@
"value": [
{
"type": 0,
"value": "Input for service_name name"
"value": "Input for service_name"
}
]
},
"status": {
"value": [
{
"type": 0,
"value": "Input for status value"
}
]
},
Expand Down Expand Up @@ -7446,10 +7460,10 @@
"value": "value"
}
],
"filterByWorkloadTypeAriaLabel": [
"filterByValuesAriaLabel": [
{
"type": 0,
"value": "Workload types"
"value": "Values"
}
],
"forDate": [
Expand Down Expand Up @@ -9589,6 +9603,12 @@
"value": "Infrastructure"
}
],
"lastProcessed": [
{
"type": 0,
"value": "Last processed"
}
],
"learnMore": [
{
"type": 0,
Expand Down Expand Up @@ -10648,7 +10668,7 @@
"value": "Optimizations table"
}
],
"optimizationsValueUnits": [
"optimizationsValue": [
{
"type": 1,
"value": "value"
Expand Down Expand Up @@ -11216,6 +11236,12 @@
"value": "Failed to get RBAC information"
}
],
"readOnly": [
{
"type": 0,
"value": "Read only"
}
],
"readOnlyPermissions": [
{
"type": 0,
Expand Down Expand Up @@ -11372,12 +11398,6 @@
"value": "Select categories to enable or disable"
}
],
"selectProjects": [
{
"type": 0,
"value": "Select projects to add or remove"
}
],
"selectRow": [
{
"type": 0,
Expand Down Expand Up @@ -11434,6 +11454,95 @@
"value": "Unable to save application settings"
}
],
"settingsSuccessChanges": [
{
"type": 0,
"value": "Changes will be reflected in report summarizations within 24 hours"
}
],
"settingsSuccessCostCategoryKeys": [
{
"options": {
"disable": {
"value": [
{
"offset": 0,
"options": {
"one": {
"value": [
{
"type": 1,
"value": "count"
},
{
"type": 0,
"value": " cost category key disabled"
}
]
},
"other": {
"value": [
{
"type": 1,
"value": "count"
},
{
"type": 0,
"value": " cost category keys disabled"
}
]
}
},
"pluralType": "cardinal",
"type": 6,
"value": "count"
}
]
},
"enable": {
"value": [
{
"offset": 0,
"options": {
"one": {
"value": [
{
"type": 1,
"value": "count"
},
{
"type": 0,
"value": " cost category key enabled"
}
]
},
"other": {
"value": [
{
"type": 1,
"value": "count"
},
{
"type": 0,
"value": " cost category keys enabled"
}
]
}
},
"pluralType": "cardinal",
"type": 6,
"value": "count"
}
]
},
"other": {
"value": []
}
},
"type": 5,
"value": "value"
}
],
"settingsSuccessDesc": [
{
"type": 0,
Expand Down Expand Up @@ -11464,6 +11573,65 @@
"value": "Source type"
}
],
"sourceTypes": [
{
"options": {
"aws": {
"value": [
{
"type": 0,
"value": "Amazon Web Services"
}
]
},
"azure": {
"value": [
{
"type": 0,
"value": "Microsoft Azure"
}
]
},
"gcp": {
"value": [
{
"type": 0,
"value": "Google Cloud Platform"
}
]
},
"ibm": {
"value": [
{
"type": 0,
"value": "IBM Cloud"
}
]
},
"oci": {
"value": [
{
"type": 0,
"value": "Oracle Cloud Infrastructure"
}
]
},
"ocp": {
"value": [
{
"type": 0,
"value": "OpenShift"
}
]
},
"other": {
"value": []
}
},
"type": 5,
"value": "value"
}
],
"sources": [
{
"type": 0,
Expand Down
Loading

0 comments on commit af0edf1

Please sign in to comment.