Skip to content

Commit

Permalink
refactor(config): sw-860 inventory to instance id (RedHatInsights#1050)
Browse files Browse the repository at this point in the history
* config, rhacs, rhel, rhods, rhosak, instance id
* services, replace inventory with instance id
  • Loading branch information
cdcabrera authored Feb 15, 2023
1 parent d593ca9 commit 17a1d45
Show file tree
Hide file tree
Showing 16 changed files with 56 additions and 56 deletions.
4 changes: 2 additions & 2 deletions src/config/__tests__/__snapshots__/product.rhacs.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ exports[`Product RHACS config should apply an inventory configuration: filtered,
"title": "t(curiosity-inventory.header_display, {"context":"name"})",
"value": "lorem ipsum",
},
"inventory_id": {
"title": "t(curiosity-inventory.header_inventory, {"context":"id"})",
"instance_id": {
"title": "t(curiosity-inventory.header_instance, {"context":"id"})",
"value": "XXXX-XXXX-XXXXX-XXXXX",
},
"last_seen": {
Expand Down
8 changes: 4 additions & 4 deletions src/config/__tests__/__snapshots__/product.rhel.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ exports[`Product RHEL config should apply an inventory configuration: filtered,
"title": "t(curiosity-inventory.header_display, {"context":"name"})",
"value": "lorem ipsum",
},
"inventory_id": {
"title": "t(curiosity-inventory.header_inventory, {"context":"id"})",
"instance_id": {
"title": "t(curiosity-inventory.header_instance, {"context":"id"})",
"value": "XXXX-XXXX-XXXXX-XXXXX",
},
"last_seen": {
Expand Down Expand Up @@ -225,8 +225,8 @@ exports[`Product RHEL config should apply an inventory configuration: filtered,
"title": "t(curiosity-inventory.header_display, {"context":"name"})",
"value": "lorem ipsum",
},
"inventory_id": {
"title": "t(curiosity-inventory.header_inventory, {"context":"id"})",
"instance_id": {
"title": "t(curiosity-inventory.header_instance, {"context":"id"})",
"value": null,
},
"last_seen": {
Expand Down
4 changes: 2 additions & 2 deletions src/config/__tests__/__snapshots__/product.rhods.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ exports[`Product RHODS config should apply an inventory configuration: filtered,
"title": "t(curiosity-inventory.header_display, {"context":"name"})",
"value": "lorem ipsum",
},
"inventory_id": {
"title": "t(curiosity-inventory.header_inventory, {"context":"id"})",
"instance_id": {
"title": "t(curiosity-inventory.header_instance, {"context":"id"})",
"value": "XXXX-XXXX-XXXXX-XXXXX",
},
"last_seen": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ exports[`Product RHOSAK config should apply an inventory configuration: filtered
"title": "t(curiosity-inventory.header_display, {"context":"name"})",
"value": "lorem ipsum",
},
"inventory_id": {
"title": "t(curiosity-inventory.header_inventory, {"context":"id"})",
"instance_id": {
"title": "t(curiosity-inventory.header_instance, {"context":"id"})",
"value": "XXXX-XXXX-XXXXX-XXXXX",
},
"last_seen": {
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/product.rhacs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('Product RHACS config', () => {
filters: initialFilters,
cellData: {
...inventoryData,
[INVENTORY_TYPES.INVENTORY_ID]: 'XXXX-XXXX-XXXXX-XXXXX'
[INVENTORY_TYPES.INSTANCE_ID]: 'XXXX-XXXX-XXXXX-XXXXX'
},
session: { authorized: { inventory: true } }
});
Expand Down
4 changes: 2 additions & 2 deletions src/config/__tests__/product.rhel.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('Product RHEL config', () => {
filters: initialFilters,
cellData: {
...inventoryData,
[INVENTORY_TYPES.INVENTORY_ID]: null,
[INVENTORY_TYPES.INSTANCE_ID]: null,
[INVENTORY_TYPES.LAST_SEEN]: null,
[INVENTORY_TYPES.CLOUD_PROVIDER]: 'dolor sit'
}
Expand All @@ -49,7 +49,7 @@ describe('Product RHEL config', () => {
filters: initialFilters,
cellData: {
...inventoryData,
[INVENTORY_TYPES.INVENTORY_ID]: 'XXXX-XXXX-XXXXX-XXXXX'
[INVENTORY_TYPES.INSTANCE_ID]: 'XXXX-XXXX-XXXXX-XXXXX'
},
session: { authorized: { inventory: true } }
});
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/product.rhods.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ describe('Product RHODS config', () => {
filters: initialFilters,
cellData: {
...inventoryData,
[INVENTORY_TYPES.INVENTORY_ID]: 'XXXX-XXXX-XXXXX-XXXXX'
[INVENTORY_TYPES.INSTANCE_ID]: 'XXXX-XXXX-XXXXX-XXXXX'
},
session: { authorized: { inventory: true } }
});
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/product.rhosak.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ describe('Product RHOSAK config', () => {
filters: initialFilters,
cellData: {
...inventoryData,
[INVENTORY_TYPES.INVENTORY_ID]: 'XXXX-XXXX-XXXXX-XXXXX'
[INVENTORY_TYPES.INSTANCE_ID]: 'XXXX-XXXX-XXXXX-XXXXX'
},
session: { authorized: { inventory: true } }
});
Expand Down
10 changes: 5 additions & 5 deletions src/config/product.rhacs.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,26 +92,26 @@ const config = {
{
id: INVENTORY_TYPES.DISPLAY_NAME,
cell: (
{ [INVENTORY_TYPES.DISPLAY_NAME]: displayName = {}, [INVENTORY_TYPES.INVENTORY_ID]: inventoryId = {} },
{ [INVENTORY_TYPES.DISPLAY_NAME]: displayName = {}, [INVENTORY_TYPES.INSTANCE_ID]: instanceId = {} },
session
) => {
const { inventory: authorized } = session?.authorized || {};

if (!inventoryId.value) {
if (!instanceId.value) {
return displayName.value;
}

let updatedDisplayName = displayName.value || inventoryId.value;
let updatedDisplayName = displayName.value || instanceId.value;

if (authorized) {
updatedDisplayName = (
<Button
isInline
component="a"
variant="link"
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${instanceId.value}/`}
>
{displayName.value || inventoryId.value}
{displayName.value || instanceId.value}
</Button>
);
}
Expand Down
10 changes: 5 additions & 5 deletions src/config/product.rhel.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,26 +167,26 @@ const config = {
{
id: INVENTORY_TYPES.DISPLAY_NAME,
cell: (
{ [INVENTORY_TYPES.DISPLAY_NAME]: displayName = {}, [INVENTORY_TYPES.INVENTORY_ID]: inventoryId = {} },
{ [INVENTORY_TYPES.DISPLAY_NAME]: displayName = {}, [INVENTORY_TYPES.INSTANCE_ID]: instanceId = {} },
session
) => {
const { inventory: authorized } = session?.authorized || {};

if (!inventoryId.value) {
if (!instanceId.value) {
return displayName.value;
}

let updatedDisplayName = displayName.value || inventoryId.value;
let updatedDisplayName = displayName.value || instanceId.value;

if (authorized) {
updatedDisplayName = (
<Button
isInline
component="a"
variant="link"
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${instanceId.value}/`}
>
{displayName.value || inventoryId.value}
{displayName.value || instanceId.value}
</Button>
);
}
Expand Down
10 changes: 5 additions & 5 deletions src/config/product.rhods.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,26 +87,26 @@ const config = {
{
id: INVENTORY_TYPES.DISPLAY_NAME,
cell: (
{ [INVENTORY_TYPES.DISPLAY_NAME]: displayName = {}, [INVENTORY_TYPES.INVENTORY_ID]: inventoryId = {} },
{ [INVENTORY_TYPES.DISPLAY_NAME]: displayName = {}, [INVENTORY_TYPES.INSTANCE_ID]: instanceId = {} },
session
) => {
const { inventory: authorized } = session?.authorized || {};

if (!inventoryId.value) {
if (!instanceId.value) {
return displayName.value;
}

let updatedDisplayName = displayName.value || inventoryId.value;
let updatedDisplayName = displayName.value || instanceId.value;

if (authorized) {
updatedDisplayName = (
<Button
isInline
component="a"
variant="link"
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${instanceId.value}/`}
>
{displayName.value || inventoryId.value}
{displayName.value || instanceId.value}
</Button>
);
}
Expand Down
10 changes: 5 additions & 5 deletions src/config/product.rhosak.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,26 +116,26 @@ const config = {
{
id: INVENTORY_TYPES.DISPLAY_NAME,
cell: (
{ [INVENTORY_TYPES.DISPLAY_NAME]: displayName = {}, [INVENTORY_TYPES.INVENTORY_ID]: inventoryId = {} },
{ [INVENTORY_TYPES.DISPLAY_NAME]: displayName = {}, [INVENTORY_TYPES.INSTANCE_ID]: instanceId = {} },
session
) => {
const { inventory: authorized } = session?.authorized || {};

if (!inventoryId.value) {
if (!instanceId.value) {
return displayName.value;
}

let updatedDisplayName = displayName.value || inventoryId.value;
let updatedDisplayName = displayName.value || instanceId.value;

if (authorized) {
updatedDisplayName = (
<Button
isInline
component="a"
variant="link"
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${inventoryId.value}/`}
href={`${helpers.UI_DEPLOY_PATH_PREFIX}/insights/inventory/${instanceId.value}/`}
>
{displayName.value || inventoryId.value}
{displayName.value || instanceId.value}
</Button>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"CATEGORY": "category",
"CLOUD_PROVIDER": "cloud_provider",
"DISPLAY_NAME": "display_name",
"INVENTORY_ID": "inventory_id",
"INSTANCE_ID": "instance_id",
"LAST_SEEN": "last_seen",
"MEASUREMENTS": "measurements",
"NUMBER_OF_GUESTS": "number_of_guests",
Expand Down Expand Up @@ -229,7 +229,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"CLOUD_PROVIDER": "cloud_provider",
"DISPLAY_NAME": "display_name",
"HAS_INFINITE_QUANTITY": "has_infinite_quantity",
"INVENTORY_ID": "inventory_id",
"INSTANCE_ID": "instance_id",
"LAST_SEEN": "last_seen",
"MEASUREMENTS": "measurements",
"NEXT_EVENT_DATE": "next_event_date",
Expand Down Expand Up @@ -483,7 +483,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"CATEGORY": "category",
"CLOUD_PROVIDER": "cloud_provider",
"DISPLAY_NAME": "display_name",
"INVENTORY_ID": "inventory_id",
"INSTANCE_ID": "instance_id",
"LAST_SEEN": "last_seen",
"MEASUREMENTS": "measurements",
"NUMBER_OF_GUESTS": "number_of_guests",
Expand Down Expand Up @@ -512,7 +512,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"CLOUD_PROVIDER": "cloud_provider",
"DISPLAY_NAME": "display_name",
"HAS_INFINITE_QUANTITY": "has_infinite_quantity",
"INVENTORY_ID": "inventory_id",
"INSTANCE_ID": "instance_id",
"LAST_SEEN": "last_seen",
"MEASUREMENTS": "measurements",
"NEXT_EVENT_DATE": "next_event_date",
Expand Down Expand Up @@ -767,7 +767,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"CATEGORY": "category",
"CLOUD_PROVIDER": "cloud_provider",
"DISPLAY_NAME": "display_name",
"INVENTORY_ID": "inventory_id",
"INSTANCE_ID": "instance_id",
"LAST_SEEN": "last_seen",
"MEASUREMENTS": "measurements",
"NUMBER_OF_GUESTS": "number_of_guests",
Expand Down Expand Up @@ -796,7 +796,7 @@ exports[`RHSM Constants should have specific properties: all exported constants
"CLOUD_PROVIDER": "cloud_provider",
"DISPLAY_NAME": "display_name",
"HAS_INFINITE_QUANTITY": "has_infinite_quantity",
"INVENTORY_ID": "inventory_id",
"INSTANCE_ID": "instance_id",
"LAST_SEEN": "last_seen",
"MEASUREMENTS": "measurements",
"NEXT_EVENT_DATE": "next_event_date",
Expand Down Expand Up @@ -1055,7 +1055,7 @@ exports[`RHSM Constants should have specific properties: specific constants 1`]
"CATEGORY": "category",
"CLOUD_PROVIDER": "cloud_provider",
"DISPLAY_NAME": "display_name",
"INVENTORY_ID": "inventory_id",
"INSTANCE_ID": "instance_id",
"LAST_SEEN": "last_seen",
"MEASUREMENTS": "measurements",
"NUMBER_OF_GUESTS": "number_of_guests",
Expand Down Expand Up @@ -1084,7 +1084,7 @@ exports[`RHSM Constants should have specific properties: specific constants 1`]
"CLOUD_PROVIDER": "cloud_provider",
"DISPLAY_NAME": "display_name",
"HAS_INFINITE_QUANTITY": "has_infinite_quantity",
"INVENTORY_ID": "inventory_id",
"INSTANCE_ID": "instance_id",
"LAST_SEEN": "last_seen",
"MEASUREMENTS": "measurements",
"NEXT_EVENT_DATE": "next_event_date",
Expand Down
14 changes: 7 additions & 7 deletions src/services/rhsm/rhsmConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ const RHSM_API_RESPONSE_HOSTS_META_TYPES = {
* RHSM response Instance DATA types.
*
* @type {{MEASUREMENTS: string, BILLING_ACCOUNT_ID: string, CATEGORY: string, SUBSCRIPTION_MANAGER_ID: string,
* INVENTORY_ID: string, NUMBER_OF_GUESTS: string, BILLING_PROVIDER: string, DISPLAY_NAME: string, CLOUD_PROVIDER: string,
* INSTANCE_ID: string, NUMBER_OF_GUESTS: string, BILLING_PROVIDER: string, DISPLAY_NAME: string, CLOUD_PROVIDER: string,
* LAST_SEEN: string}}
*/
const RHSM_API_RESPONSE_INSTANCES_DATA_TYPES = {
Expand All @@ -160,7 +160,7 @@ const RHSM_API_RESPONSE_INSTANCES_DATA_TYPES = {
CLOUD_PROVIDER: 'cloud_provider',
CATEGORY: 'category',
DISPLAY_NAME: 'display_name',
INVENTORY_ID: 'inventory_id',
INSTANCE_ID: 'instance_id',
LAST_SEEN: 'last_seen',
MEASUREMENTS: 'measurements',
NUMBER_OF_GUESTS: 'number_of_guests',
Expand Down Expand Up @@ -473,7 +473,7 @@ const RHSM_INTERNAL_PRODUCT_DISPLAY_TYPES = {
* TRANSFER_GIBIBYTES: string, CORE_SECONDS: string, STORAGE_GIBIBYTE_MONTHS: string},
* RHSM_API_RESPONSE_INSTANCES_META_TYPES: {MEASUREMENTS: string, PRODUCT: string, COUNT: string},
* RHSM_API_RESPONSE_INSTANCES_DATA_TYPES: {MEASUREMENTS: string, BILLING_ACCOUNT_ID: string, CATEGORY: string,
* SUBSCRIPTION_MANAGER_ID: string, INVENTORY_ID: string, NUMBER_OF_GUESTS: string, BILLING_PROVIDER: string,
* SUBSCRIPTION_MANAGER_ID: string, INSTANCE_ID: string, NUMBER_OF_GUESTS: string, BILLING_PROVIDER: string,
* DISPLAY_NAME: string, CLOUD_PROVIDER: string, LAST_SEEN: string}, RHSM_API_RESPONSE_SLA_TYPES: {PREMIUM: string,
* SELF: string, NONE: string, STANDARD: string}, RHSM_API_PATH_PRODUCT_ARCHITECTURE_RHEL_TYPES: {RHEL_ARM: string,
* RHEL_IBM_Z: string, RHEL_IBM_POWER: string, RHEL_X86: string}, RHSM_API_RESPONSE_HOSTS_META_TYPES: {PRODUCT: string,
Expand All @@ -494,10 +494,10 @@ const RHSM_INTERNAL_PRODUCT_DISPLAY_TYPES = {
* RHEL_IBM_POWER: string}, RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE: string,
* AWS: string, ORACLE: string}, RHSM_API_RESPONSE_ERRORS_TYPES: {CODE: string},
* RHSM_API_RESPONSE_TALLY_CAPACITY_DATA_TYPES: {DATE: string, HAS_DATA: string, VALUE: string, HAS_INFINITE_QUANTITY: string},
* RHSM_API_RESPONSE_TALLY_CAPACITY_META_TYPES: {TOTAL_MONTHLY: string, DATE: string, PRODUCT: string,
* HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string, HAS_DATA: string, METRIC_ID: string, COUNT: string,
* VALUE: string}, RHSM_API_QUERY_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE: string, AWS: string,
* ORACLE: string}, RHSM_API_QUERY_CATEGORY_TYPES: {CLOUD: string, PHYSICAL: string, HYPERVISOR: string, VIRTUAL: string},
* RHSM_API_RESPONSE_TALLY_CAPACITY_META_TYPES: {TOTAL_MONTHLY: string, DATE: string, PRODUCT: string, HAS_CLOUDIGRADE_DATA: string,
* HAS_CLOUDIGRADE_MISMATCH: string, HAS_DATA: string, METRIC_ID: string, COUNT: string, VALUE: string},
* RHSM_API_QUERY_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE: string, AWS: string, ORACLE: string},
* RHSM_API_QUERY_CATEGORY_TYPES: {CLOUD: string, PHYSICAL: string, HYPERVISOR: string, VIRTUAL: string},
* RHSM_API_QUERY_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string, PRODUCTION: string},
* RHSM_API_QUERY_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, STANDARD: string},
* RHSM_API_QUERY_SET_INVENTORY_TYPES: {BILLING_ACCOUNT_ID: string, DIRECTION: string, END_DATE: string, SLA: string,
Expand Down
2 changes: 1 addition & 1 deletion src/services/rhsm/rhsmSchemas.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const instancesMetaSchema = metaResponseSchema
* @type {*} Joi schema
*/
const instancesItem = Joi.object({
inventory_id: Joi.string().optional().allow(null),
instance_id: Joi.string().optional().allow(null),
category: Joi.string().lowercase().optional().allow(null),
cloud_provider: Joi.string().lowercase().optional().allow(null, ''),
display_name: Joi.string().optional().allow(null),
Expand Down
10 changes: 5 additions & 5 deletions src/services/rhsm/rhsmServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -2558,7 +2558,7 @@ const getHostsInventoryGuests = (id, params = {}, options = {}) => {
* {
* "category": "physical",
* "billing_account_id": "xxxxx-xxxx-CCCCC-xxxx-xxxx10",
* "inventory_id": "CCCCC-b344-4778-831c-CCCCCCC",
* "instance_id": "CCCCC-b344-4778-831c-CCCCCCC",
* "subscription_manager_id": "CCCCC-5b00-42fa-CCCCC-75801d45cc6d",
* "display_name": "lorem.example.com",
* "measurements": [
Expand All @@ -2572,7 +2572,7 @@ const getHostsInventoryGuests = (id, params = {}, options = {}) => {
* {
* "category": "virtual",
* "billing_account_id": "xxxxx-xxxx-FFFFF-xxxx-xxxx40",
* "inventory_id": "FFFFF-b344-4778-831c-FFFFF",
* "instance_id": "FFFFF-b344-4778-831c-FFFFF",
* "subscription_manager_id": "FFFFF-5b00-42fa-FFFFF-75801d45cc6d",
* "display_name": "lorem.example.com",
* "measurements": [
Expand All @@ -2588,7 +2588,7 @@ const getHostsInventoryGuests = (id, params = {}, options = {}) => {
* "category": "cloud",
* "billing_provider": "red hat",
* "billing_account_id": "xxxxx-xxxx-xxxx-xxxx-xxxx01",
* "inventory_id": "d6214a0b-b344-4778-831c-d53dcacb2da3",
* "instance_id": "d6214a0b-b344-4778-831c-d53dcacb2da3",
* "subscription_manager_id": "adafd9d5-5b00-42fa-a6c9-75801d45cc6d",
* "display_name": "rhv.example.com",
* "measurements": [
Expand All @@ -2603,7 +2603,7 @@ const getHostsInventoryGuests = (id, params = {}, options = {}) => {
* "category": "cloud",
* "billing_provider": "azure",
* "billing_account_id": "xxxxx-xxxx-xxxx-xxxx-xxxx02",
* "inventory_id": "XXXXXX-b344-4778-831c-XXXXXXXX",
* "instance_id": "XXXXXX-b344-4778-831c-XXXXXXXX",
* "subscription_manager_id": "XXXXXX-5b00-42fa-XXXX-75801d45cc6d",
* "display_name": "dolor.example.com",
* "measurements": [
Expand All @@ -2617,7 +2617,7 @@ const getHostsInventoryGuests = (id, params = {}, options = {}) => {
* {
* "category": "physical",
* "billing_account_id": "xxxxx-xxxx-xxxx-xxxx-xxxx03",
* "inventory_id": "BBBBB-b344-4778-831c-BBBBBBB",
* "instance_id": "BBBBB-b344-4778-831c-BBBBBBB",
* "subscription_manager_id": "BBBBB-5b00-42fa-BBBBB-75801d45cc6d",
* "display_name": "lorem.example.com",
* "measurements": [
Expand Down

0 comments on commit 17a1d45

Please sign in to comment.