Use tenant and subscription terminology for Azure cloud

deepfence_frontend/apps/dashboard/api-spec.json

@@ -11488,7 +11488,7 @@
               "application/json": {
                 "schema": {
                   "type": "array",
-                  "items": { "$ref": "#/components/schemas/ModelSettingsResponse" }
+                  "items": { "$ref": "#/components/schemas/SettingSettingsResponse" }
                 }
               }
             }
@@ -11540,7 +11540,7 @@
         "requestBody": {
           "content": {
             "application/json": {
-              "schema": { "$ref": "#/components/schemas/ModelSettingUpdateRequest" }
+              "schema": { "$ref": "#/components/schemas/SettingSettingUpdateRequest" }
             }
           }
         },
@@ -15516,28 +15516,6 @@
           }
         }
       },
-      "ModelSettingUpdateRequest": {
-        "required": ["key", "value"],
-        "type": "object",
-        "properties": {
-          "key": {
-            "enum": ["console_url", "file_server_url", "inactive_delete_scan_results"],
-            "type": "string"
-          },
-          "value": { "type": "string" }
-        }
-      },
-      "ModelSettingsResponse": {
-        "required": ["id", "key", "label", "value", "description"],
-        "type": "object",
-        "properties": {
-          "description": { "type": "string" },
-          "id": { "type": "integer" },
-          "key": { "type": "string" },
-          "label": { "type": "string" },
-          "value": {}
-        }
-      },
       "ModelStopScanRequest": {
         "required": ["scan_ids", "scan_type"],
         "type": "object",
@@ -16157,6 +16135,28 @@
           "window": { "$ref": "#/components/schemas/ModelFetchWindow" }
         }
       },
+      "SettingSettingUpdateRequest": {
+        "required": ["key", "value"],
+        "type": "object",
+        "properties": {
+          "key": {
+            "enum": ["console_url", "file_server_url", "inactive_delete_scan_results"],
+            "type": "string"
+          },
+          "value": { "type": "string" }
+        }
+      },
+      "SettingSettingsResponse": {
+        "required": ["id", "key", "label", "value", "description"],
+        "type": "object",
+        "properties": {
+          "description": { "type": "string" },
+          "id": { "type": "integer" },
+          "key": { "type": "string" },
+          "label": { "type": "string" },
+          "value": {}
+        }
+      },
       "SqlNullTime": { "type": "object" },
       "UtilsAdvancedReportFilters": {
         "type": "object",

deepfence_frontend/apps/dashboard/src/api/generated/.openapi-generator/FILES

@@ -198,8 +198,6 @@ models/ModelSecretRule.ts
 models/ModelSecretScanResult.ts
 models/ModelSecretScanResultRules.ts
 models/ModelSecretScanTriggerReq.ts
-models/ModelSettingUpdateRequest.ts
-models/ModelSettingsResponse.ts
 models/ModelStopScanRequest.ts
 models/ModelSummary.ts
 models/ModelTopologyDeltaReq.ts
@@ -233,6 +231,8 @@ models/SearchSearchCountResp.ts
 models/SearchSearchFilter.ts
 models/SearchSearchNodeReq.ts
 models/SearchSearchScanReq.ts
+models/SettingSettingUpdateRequest.ts
+models/SettingSettingsResponse.ts
 models/UtilsAdvancedReportFilters.ts
 models/UtilsReportFilters.ts
 models/UtilsReportOptions.ts

deepfence_frontend/apps/dashboard/src/api/generated/apis/SettingsApi.ts

@@ -29,12 +29,12 @@ import type {
   ModelMessageResponse,
   ModelRegisterLicenseRequest,
   ModelRegisterLicenseResponse,
-  ModelSettingUpdateRequest,
-  ModelSettingsResponse,
   ModelUpdateScheduledTaskRequest,
   PostgresqlDbGetAuditLogsRow,
   PostgresqlDbScheduler,
   SearchSearchCountResp,
+  SettingSettingUpdateRequest,
+  SettingSettingsResponse,
 } from '../models';
 import {
     ApiDocsBadRequestResponseFromJSON,
@@ -65,10 +65,6 @@ import {
     ModelRegisterLicenseRequestToJSON,
     ModelRegisterLicenseResponseFromJSON,
     ModelRegisterLicenseResponseToJSON,
-    ModelSettingUpdateRequestFromJSON,
-    ModelSettingUpdateRequestToJSON,
-    ModelSettingsResponseFromJSON,
-    ModelSettingsResponseToJSON,
     ModelUpdateScheduledTaskRequestFromJSON,
     ModelUpdateScheduledTaskRequestToJSON,
     PostgresqlDbGetAuditLogsRowFromJSON,
@@ -77,6 +73,10 @@ import {
     PostgresqlDbSchedulerToJSON,
     SearchSearchCountRespFromJSON,
     SearchSearchCountRespToJSON,
+    SettingSettingUpdateRequestFromJSON,
+    SettingSettingUpdateRequestToJSON,
+    SettingSettingsResponseFromJSON,
+    SettingSettingsResponseToJSON,
 } from '../models';
 
 export interface AddEmailConfigurationRequest {
@@ -118,7 +118,7 @@ export interface UpdateScheduledTaskRequest {
 
 export interface UpdateSettingRequest {
     id: number;
-    modelSettingUpdateRequest?: ModelSettingUpdateRequest;
+    settingSettingUpdateRequest?: SettingSettingUpdateRequest;
 }
 
 export interface UploadAgentVersionRequest {
@@ -325,13 +325,13 @@ export interface SettingsApiInterface {
      * @throws {RequiredError}
      * @memberof SettingsApiInterface
      */
-    getSettingsRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<ModelSettingsResponse>>>;
+    getSettingsRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<SettingSettingsResponse>>>;
 
     /**
      * Get all settings
      * Get settings
      */
-    getSettings(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<ModelSettingsResponse>>;
+    getSettings(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<SettingSettingsResponse>>;
 
     /**
      * Get audit logs for all users
@@ -432,7 +432,7 @@ export interface SettingsApiInterface {
      * Update setting
      * @summary Update setting
      * @param {number} id 
-     * @param {ModelSettingUpdateRequest} [modelSettingUpdateRequest] 
+     * @param {SettingSettingUpdateRequest} [settingSettingUpdateRequest] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SettingsApiInterface
@@ -945,7 +945,7 @@ export class SettingsApi extends runtime.BaseAPI implements SettingsApiInterface
      * Get all settings
      * Get settings
      */
-    async getSettingsRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<ModelSettingsResponse>>> {
+    async getSettingsRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Array<SettingSettingsResponse>>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -965,14 +965,14 @@ export class SettingsApi extends runtime.BaseAPI implements SettingsApiInterface
             query: queryParameters,
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(ModelSettingsResponseFromJSON));
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(SettingSettingsResponseFromJSON));
     }
 
     /**
      * Get all settings
      * Get settings
      */
-    async getSettings(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<ModelSettingsResponse>> {
+    async getSettings(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<Array<SettingSettingsResponse>> {
         const response = await this.getSettingsRaw(initOverrides);
         return await response.value();
     }
@@ -1236,7 +1236,7 @@ export class SettingsApi extends runtime.BaseAPI implements SettingsApiInterface
             method: 'PATCH',
             headers: headerParameters,
             query: queryParameters,
-            body: ModelSettingUpdateRequestToJSON(requestParameters.modelSettingUpdateRequest),
+            body: SettingSettingUpdateRequestToJSON(requestParameters.settingSettingUpdateRequest),
         }, initOverrides);
 
         return new runtime.VoidApiResponse(response);

deepfence_frontend/apps/dashboard/src/api/generated/models/ModelSettingUpdateRequest.ts → deepfence_frontend/apps/dashboard/src/api/generated/models/SettingSettingUpdateRequest.ts

@@ -16,19 +16,19 @@ import { exists, mapValues } from '../runtime';
 /**
  * 
  * @export
- * @interface ModelSettingUpdateRequest
+ * @interface SettingSettingUpdateRequest
  */
-export interface ModelSettingUpdateRequest {
+export interface SettingSettingUpdateRequest {
     /**
      * 
      * @type {string}
-     * @memberof ModelSettingUpdateRequest
+     * @memberof SettingSettingUpdateRequest
      */
-    key: ModelSettingUpdateRequestKeyEnum;
+    key: SettingSettingUpdateRequestKeyEnum;
     /**
      * 
      * @type {string}
-     * @memberof ModelSettingUpdateRequest
+     * @memberof SettingSettingUpdateRequest
      */
     value: string;
 }
@@ -37,30 +37,30 @@ export interface ModelSettingUpdateRequest {
 /**
  * @export
  */
-export const ModelSettingUpdateRequestKeyEnum = {
+export const SettingSettingUpdateRequestKeyEnum = {
     ConsoleUrl: 'console_url',
     FileServerUrl: 'file_server_url',
     InactiveDeleteScanResults: 'inactive_delete_scan_results'
 } as const;
-export type ModelSettingUpdateRequestKeyEnum = typeof ModelSettingUpdateRequestKeyEnum[keyof typeof ModelSettingUpdateRequestKeyEnum];
+export type SettingSettingUpdateRequestKeyEnum = typeof SettingSettingUpdateRequestKeyEnum[keyof typeof SettingSettingUpdateRequestKeyEnum];
 
 
 /**
- * Check if a given object implements the ModelSettingUpdateRequest interface.
+ * Check if a given object implements the SettingSettingUpdateRequest interface.
  */
-export function instanceOfModelSettingUpdateRequest(value: object): boolean {
+export function instanceOfSettingSettingUpdateRequest(value: object): boolean {
     let isInstance = true;
     isInstance = isInstance && "key" in value;
     isInstance = isInstance && "value" in value;
 
     return isInstance;
 }
 
-export function ModelSettingUpdateRequestFromJSON(json: any): ModelSettingUpdateRequest {
-    return ModelSettingUpdateRequestFromJSONTyped(json, false);
+export function SettingSettingUpdateRequestFromJSON(json: any): SettingSettingUpdateRequest {
+    return SettingSettingUpdateRequestFromJSONTyped(json, false);
 }
 
-export function ModelSettingUpdateRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): ModelSettingUpdateRequest {
+export function SettingSettingUpdateRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): SettingSettingUpdateRequest {
     if ((json === undefined) || (json === null)) {
         return json;
     }
@@ -71,7 +71,7 @@ export function ModelSettingUpdateRequestFromJSONTyped(json: any, ignoreDiscrimi
     };
 }
 
-export function ModelSettingUpdateRequestToJSON(value?: ModelSettingUpdateRequest | null): any {
+export function SettingSettingUpdateRequestToJSON(value?: SettingSettingUpdateRequest | null): any {
     if (value === undefined) {
         return undefined;
     }

deepfence_frontend/apps/dashboard/src/api/generated/models/ModelSettingsResponse.ts → deepfence_frontend/apps/dashboard/src/api/generated/models/SettingSettingsResponse.ts

@@ -16,45 +16,45 @@ import { exists, mapValues } from '../runtime';
 /**
  * 
  * @export
- * @interface ModelSettingsResponse
+ * @interface SettingSettingsResponse
  */
-export interface ModelSettingsResponse {
+export interface SettingSettingsResponse {
     /**
      * 
      * @type {string}
-     * @memberof ModelSettingsResponse
+     * @memberof SettingSettingsResponse
      */
     description: string;
     /**
      * 
      * @type {number}
-     * @memberof ModelSettingsResponse
+     * @memberof SettingSettingsResponse
      */
     id: number;
     /**
      * 
      * @type {string}
-     * @memberof ModelSettingsResponse
+     * @memberof SettingSettingsResponse
      */
     key: string;
     /**
      * 
      * @type {string}
-     * @memberof ModelSettingsResponse
+     * @memberof SettingSettingsResponse
      */
     label: string;
     /**
      * 
      * @type {any}
-     * @memberof ModelSettingsResponse
+     * @memberof SettingSettingsResponse
      */
     value: any | null;
 }
 
 /**
- * Check if a given object implements the ModelSettingsResponse interface.
+ * Check if a given object implements the SettingSettingsResponse interface.
  */
-export function instanceOfModelSettingsResponse(value: object): boolean {
+export function instanceOfSettingSettingsResponse(value: object): boolean {
     let isInstance = true;
     isInstance = isInstance && "description" in value;
     isInstance = isInstance && "id" in value;
@@ -65,11 +65,11 @@ export function instanceOfModelSettingsResponse(value: object): boolean {
     return isInstance;
 }
 
-export function ModelSettingsResponseFromJSON(json: any): ModelSettingsResponse {
-    return ModelSettingsResponseFromJSONTyped(json, false);
+export function SettingSettingsResponseFromJSON(json: any): SettingSettingsResponse {
+    return SettingSettingsResponseFromJSONTyped(json, false);
 }
 
-export function ModelSettingsResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): ModelSettingsResponse {
+export function SettingSettingsResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): SettingSettingsResponse {
     if ((json === undefined) || (json === null)) {
         return json;
     }
@@ -83,7 +83,7 @@ export function ModelSettingsResponseFromJSONTyped(json: any, ignoreDiscriminato
     };
 }
 
-export function ModelSettingsResponseToJSON(value?: ModelSettingsResponse | null): any {
+export function SettingSettingsResponseToJSON(value?: SettingSettingsResponse | null): any {
     if (value === undefined) {
         return undefined;
     }

deepfence_frontend/apps/dashboard/src/api/generated/models/index.ts

@@ -172,8 +172,6 @@ export * from './ModelSecretRule';
 export * from './ModelSecretScanResult';
 export * from './ModelSecretScanResultRules';
 export * from './ModelSecretScanTriggerReq';
-export * from './ModelSettingUpdateRequest';
-export * from './ModelSettingsResponse';
 export * from './ModelStopScanRequest';
 export * from './ModelSummary';
 export * from './ModelTopologyDeltaReq';
@@ -207,6 +205,8 @@ export * from './SearchSearchCountResp';
 export * from './SearchSearchFilter';
 export * from './SearchSearchNodeReq';
 export * from './SearchSearchScanReq';
+export * from './SettingSettingUpdateRequest';
+export * from './SettingSettingsResponse';
 export * from './UtilsAdvancedReportFilters';
 export * from './UtilsReportFilters';
 export * from './UtilsReportOptions';

deepfence_frontend/apps/dashboard/src/components/clouds-connector/AzureConnectorForm.tsx

@@ -20,8 +20,7 @@ export const AzureConnectorForm = () => {
           title="Terraform"
         >
           <div className="text-p7a text-text-text-and-icon">
-            Connect to your Azure Cloud Account via Terraform. Find out more information
-            by{' '}
+            Connect to your Microsoft Azure via terraform. Find out more information by{' '}
             <DFLink
               href={`https://community.deepfence.io/threatmapper/docs/v2.2/cloudscanner/azure`}
               target="_blank"