Compare commits

..
32 changed files with 77 additions and 620 deletions
-6
View File
@@ -71,11 +71,6 @@ jobs:
sudo mv helmfile /usr/local/bin/ sudo mv helmfile /usr/local/bin/
helmfile --version helmfile --version
- name: Install Helm Diff plugin
run: |
helm plugin install https://github.com/databus23/helm-diff --version v3.9.3
helm diff version
- name: Debug Helm env - name: Debug Helm env
run: | run: |
helm env helm env
@@ -107,5 +102,4 @@ jobs:
- name: Run Helmfile Diff - name: Run Helmfile Diff
env: env:
ENV: ${{ needs.extract_environment.outputs.environment }} ENV: ${{ needs.extract_environment.outputs.environment }}
HELM_PLUGINS: /home/runner/.local/share/helm/plugins
run: helmfile -f deploy/helmfiles/${ENV}.yaml diff run: helmfile -f deploy/helmfiles/${ENV}.yaml diff
+1 -2
View File
@@ -47,6 +47,7 @@ maestro:
open_customer_id: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e open_customer_id: f239718a-a271-4ef9-ae7e-02a2f0f3aa6e
open_group_id: 401573bb-334f-44b2-b30e-88d4cea31ae9 open_group_id: 401573bb-334f-44b2-b30e-88d4cea31ae9
platform_api_url: https://oz8v2zid1e.execute-api.us-east-1.amazonaws.com platform_api_url: https://oz8v2zid1e.execute-api.us-east-1.amazonaws.com
connections_api_url: https://wv6fw7ayj4.execute-api.us-east-1.amazonaws.com
storage_explorer_api_url: "https://storage-explorer-{customer}.dadosfera.ai/api" storage_explorer_api_url: "https://storage-explorer-{customer}.dadosfera.ai/api"
dedicated_proxy: "" dedicated_proxy: ""
restricted_ip: "" restricted_ip: ""
@@ -56,8 +57,6 @@ maestro:
redis_tls: "true" redis_tls: "true"
cookie_secret: "13cc5e136d3074bcc05bec8697092ec1f5f376bf" cookie_secret: "13cc5e136d3074bcc05bec8697092ec1f5f376bf"
firebase_base_url: https://feature-flag-25bf6-default-rtdb.firebaseio.com/prd firebase_base_url: https://feature-flag-25bf6-default-rtdb.firebaseio.com/prd
connections_api_url: https://wv6fw7ayj4.execute-api.us-east-1.amazonaws.com
autoscaling: autoscaling:
enabled: false enabled: false
minReplicas: 1 minReplicas: 1
+2 -327
View File
@@ -900,9 +900,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -952,9 +949,6 @@
"connections" "connections"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -1003,9 +997,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -1042,9 +1033,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -1078,9 +1066,6 @@
"connections" "connections"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -2418,9 +2403,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -2504,9 +2486,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -2546,9 +2525,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -2588,9 +2564,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -2628,9 +2601,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -2670,9 +2640,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -2714,9 +2681,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -2758,9 +2722,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3110,9 +3071,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3162,9 +3120,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3235,9 +3190,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3278,9 +3230,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3321,9 +3270,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3364,9 +3310,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3407,9 +3350,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3457,9 +3397,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3505,9 +3442,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3556,9 +3490,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3597,9 +3528,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3658,9 +3586,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3709,9 +3634,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3752,9 +3674,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3797,9 +3716,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3849,9 +3765,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3901,9 +3814,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -3951,9 +3861,6 @@
"PipelinesV2" "PipelinesV2"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4124,9 +4031,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4152,9 +4056,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4191,9 +4092,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4228,9 +4126,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4265,9 +4160,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4295,9 +4187,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4325,9 +4214,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4355,9 +4241,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4394,9 +4277,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4433,9 +4313,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4463,9 +4340,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4493,9 +4367,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4533,9 +4404,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4572,9 +4440,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4619,9 +4484,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4658,9 +4520,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4705,9 +4564,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4718,7 +4574,6 @@
"get": { "get": {
"operationId": "PlatformApiController_getPipelineRunJobs", "operationId": "PlatformApiController_getPipelineRunJobs",
"summary": "Get pipeline run jobs", "summary": "Get pipeline run jobs",
"description": "Proxies platform-api DB-backed job runs and returns `{ jobs: [...] }`.",
"parameters": [ "parameters": [
{ {
"name": "pipelineId", "name": "pipelineId",
@@ -4739,22 +4594,11 @@
], ],
"responses": { "responses": {
"200": { "200": {
"description": "DB-backed job runs for the selected pipeline run.", "description": "",
"content": { "content": {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "type": "object"
"properties": {
"jobs": {
"type": "array",
"items": {
"type": "object"
}
}
},
"required": [
"jobs"
]
} }
} }
} }
@@ -4800,9 +4644,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4837,9 +4678,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4876,9 +4714,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4915,9 +4750,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4955,9 +4787,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -4985,9 +4814,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -5015,9 +4841,6 @@
"Platform API" "Platform API"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -5429,9 +5252,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -5475,9 +5295,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -5587,9 +5404,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -5622,9 +5436,6 @@
"Catalog" "Catalog"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -5667,9 +5478,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -5718,48 +5526,6 @@
] ]
} }
}, },
"/catalog/custom-properties": {
"get": {
"operationId": "CatalogController_getCustomPropertyDefinitions",
"parameters": [
{
"name": "dadosfera-lang",
"in": "header",
"required": false,
"schema": {
"enum": [
"pt-br",
"en-us"
],
"type": "string"
}
}
],
"responses": {
"200": {
"description": "",
"content": {
"application/json": {
"schema": {
"type": "object"
}
}
}
}
},
"tags": [
"Catalog"
],
"security": [
{
"access-token": []
},
{
"access-token": []
}
]
}
},
"/catalog/data-asset/{id}": { "/catalog/data-asset/{id}": {
"get": { "get": {
"operationId": "CatalogController_getDataAsset", "operationId": "CatalogController_getDataAsset",
@@ -5805,9 +5571,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -5866,9 +5629,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -5917,9 +5677,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6013,9 +5770,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6066,9 +5820,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6127,9 +5878,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6186,9 +5934,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6249,9 +5994,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6292,9 +6034,6 @@
"Catalog" "Catalog"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6335,9 +6074,6 @@
"Catalog" "Catalog"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6398,9 +6134,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6459,9 +6192,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -6838,9 +6568,6 @@
{ {
"access-token": [] "access-token": []
}, },
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -7294,9 +7021,6 @@
"Connection Test" "Connection Test"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -7333,9 +7057,6 @@
"Connection Test" "Connection Test"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -7372,9 +7093,6 @@
"Connection Test" "Connection Test"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -7411,9 +7129,6 @@
"Connection Test" "Connection Test"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -7450,9 +7165,6 @@
"Connection Test" "Connection Test"
], ],
"security": [ "security": [
{
"access-token": []
},
{ {
"access-token": [] "access-token": []
} }
@@ -11321,37 +11033,6 @@
"docs" "docs"
] ]
}, },
"CustomPropertyDto": {
"type": "object",
"properties": {
"key": {
"type": "string"
},
"value": {
"type": "string"
},
"type": {
"type": "string",
"enum": [
"text",
"number",
"date",
"boolean"
]
},
"color": {
"type": "string"
},
"emoji": {
"type": "string"
}
},
"required": [
"key",
"value",
"type"
]
},
"IUpdateDataRequest": { "IUpdateDataRequest": {
"type": "object", "type": "object",
"properties": { "properties": {
@@ -11380,12 +11061,6 @@
}, },
"docs": { "docs": {
"type": "string" "type": "string"
},
"custom_properties": {
"type": "array",
"items": {
"$ref": "#/components/schemas/CustomPropertyDto"
}
} }
}, },
"required": [ "required": [
-1
View File
@@ -11,7 +11,6 @@ const config: Config.InitialOptions = {
'<rootDir>/node_modules/', '<rootDir>/node_modules/',
'.*\\.module\\.[jt]s$', '.*\\.module\\.[jt]s$',
], ],
setupFiles: ['<rootDir>/jest.setup.ts'],
// moduleDirectories: ['node_modules'], // default is already 'node_modules' // moduleDirectories: ['node_modules'], // default is already 'node_modules'
// rootDir: '.', //No need // rootDir: '.', //No need
// testEnvironment: 'node', //Defaults to 'node' // testEnvironment: 'node', //Defaults to 'node'
-3
View File
@@ -1,3 +0,0 @@
process.env.DUC_URL="duc:50051"
process.env.INFACTORY_URL="in-factory:50052"
process.env.PIFACTORY_URL="pi-factory:50053"
+4 -5
View File
@@ -16,7 +16,7 @@
"@aws-sdk/lib-dynamodb": "^3.414.0", "@aws-sdk/lib-dynamodb": "^3.414.0",
"@aws-sdk/signature-v4": "^3.370.0", "@aws-sdk/signature-v4": "^3.370.0",
"@dadosfera/dadosfera-logs": "^1.0.0-beta.4", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
"@dadosfera/protospack-v2": "3.40.0", "@dadosfera/protospack-v2": "^3.40.0-beta.10",
"@grpc/grpc-js": "^1.9.3", "@grpc/grpc-js": "^1.9.3",
"@grpc/proto-loader": "^0.7.9", "@grpc/proto-loader": "^0.7.9",
"@nestjs/cli": "^9.5.0", "@nestjs/cli": "^9.5.0",
@@ -1735,10 +1735,9 @@
} }
}, },
"node_modules/@dadosfera/protospack-v2": { "node_modules/@dadosfera/protospack-v2": {
"version": "3.40.0", "version": "3.40.0-beta.10",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.40.0.tgz", "resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.40.0-beta.10.tgz",
"integrity": "sha512-tzYAGosFjGUgi3pAvXqv+Eqqjca9tH1kU9kJdRI5d1rLXNimo0fIuPWxWng0C4OBH/2sIgC1WLHseq+DZ6qgdw==", "integrity": "sha512-F45dSEIKG+gwwDMYHayA242bFwhFTJbZm26KesQbGhf4I45ur6hYZD8dK0voNuVQInLMQhtm6+7th6/jJ8xpTQ==",
"license": "ISC",
"dependencies": { "dependencies": {
"@grpc/grpc-js": "^1.9.3", "@grpc/grpc-js": "^1.9.3",
"rxjs": "^7.5.5" "rxjs": "^7.5.5"
+1 -1
View File
@@ -34,7 +34,7 @@
"@aws-sdk/lib-dynamodb": "^3.414.0", "@aws-sdk/lib-dynamodb": "^3.414.0",
"@aws-sdk/signature-v4": "^3.370.0", "@aws-sdk/signature-v4": "^3.370.0",
"@dadosfera/dadosfera-logs": "^1.0.0-beta.4", "@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
"@dadosfera/protospack-v2": "3.40.0", "@dadosfera/protospack-v2": "^3.40.0-beta.10",
"@grpc/grpc-js": "^1.9.3", "@grpc/grpc-js": "^1.9.3",
"@grpc/proto-loader": "^0.7.9", "@grpc/proto-loader": "^0.7.9",
"@nestjs/cli": "^9.5.0", "@nestjs/cli": "^9.5.0",
-2
View File
@@ -722,8 +722,6 @@ export const DADOSFERA_MODULES_KEYS = {
PII: 'pii', PII: 'pii',
EMBED: 'embedded-analytics', EMBED: 'embedded-analytics',
EMBED_ASSIGNED: 'embed-assigned', EMBED_ASSIGNED: 'embed-assigned',
CATALOG: 'catalog',
COLLECT: 'collect',
} }
export const DADOSFERA_MODULES: Array<DadosferaModule> = [ export const DADOSFERA_MODULES: Array<DadosferaModule> = [
+2 -4
View File
@@ -37,7 +37,6 @@ import {
RequireAllPermissions, RequireAllPermissions,
} from 'src/decorators/authentication.decorator'; } from 'src/decorators/authentication.decorator';
import { AuthClientService } from './auth.service'; import { AuthClientService } from './auth.service';
import { UserDTO } from './dtos/login';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter'; import { GrpcToHttpExceptionFilter } from '../../error/grpc-to-http-exception.filter';
import { RequestUser, User } from 'src/decorators/user.decorator'; import { RequestUser, User } from 'src/decorators/user.decorator';
@@ -487,7 +486,7 @@ export class AuthController {
this.logger.info('Authenticating via X-Api-key header'); this.logger.info('Authenticating via X-Api-key header');
const { api_key } = await this.apiKeyService.get(apiKey); const { api_key } = await this.apiKeyService.get(apiKey);
const userDto: UserDTO = { const userDto = {
id: api_key.user_id, id: api_key.user_id,
name: api_key.username, name: api_key.username,
email: api_key.username, email: api_key.username,
@@ -495,8 +494,7 @@ export class AuthController {
id: api_key.customer_id, id: api_key.customer_id,
name: api_key.customer_name, name: api_key.customer_name,
tier: api_key.customer_tier, tier: api_key.customer_tier,
}, }
permissions: [],
}; };
return res.status(200).json(userDto); return res.status(200).json(userDto);
-3
View File
@@ -447,9 +447,6 @@ export class AuthClientService implements OnModuleInit {
name: payload.customer_name, name: payload.customer_name,
tier: payload.customer_tier, tier: payload.customer_tier,
}, },
// Raw permission seqids from the JWT. Consumers own the seqid->meaning
// mapping (e.g. Orchest's auth-server); Maestro reports them as-is.
permissions: payload.permissions ?? [],
}; };
return userDto; return userDto;
+1 -2
View File
@@ -152,6 +152,5 @@ export type UserDTO = {
id: string, id: string,
name: string, name: string,
tier: string, tier: string,
}, }
permissions: number[],
} }
-71
View File
@@ -85,9 +85,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.GET, PERMISSIONS_GROUPS.CATALOG.permissions.GET,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async searchCatalog( async searchCatalog(
@User() user: RequestUser, @User() user: RequestUser,
@Query() query: ICatalogAllRequest, @Query() query: ICatalogAllRequest,
@@ -127,9 +124,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.GET, PERMISSIONS_GROUPS.CATALOG.permissions.GET,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async dowloadAsserts( async dowloadAsserts(
@User() user: RequestUser, @User() user: RequestUser,
@Query() query: ICatalogAllRequest, @Query() query: ICatalogAllRequest,
@@ -173,9 +167,6 @@ export class CatalogController {
@ApiInternalOnlyEndpoint() @ApiInternalOnlyEndpoint()
@Get('data-asset') @Get('data-asset')
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async findByPipelineAndObject(@User() user: RequestUser, @Query() query) { async findByPipelineAndObject(@User() user: RequestUser, @Query() query) {
const { username, user_id, customer_id, customer_name, permissions } = user; const { username, user_id, customer_id, customer_name, permissions } = user;
const { pipeline, object } = query; const { pipeline, object } = query;
@@ -234,9 +225,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.GET, PERMISSIONS_GROUPS.CATALOG.permissions.GET,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async findAllTags(@Body() body) { async findAllTags(@Body() body) {
this.logger.info(`/catalog - ON FIND ALL TAGS ROUTE`, { this.logger.info(`/catalog - ON FIND ALL TAGS ROUTE`, {
user: body.info.user_id, user: body.info.user_id,
@@ -283,31 +271,11 @@ export class CatalogController {
} }
@Get('custom-properties')
@RequireSomePermission(
PERMISSIONS_GROUPS.CATALOG.permissions.GET,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
)
async getCustomPropertyDefinitions(@User() user: RequestUser) {
const { customer_id, customer_name, user_id, username } = user;
const metadata = PackTheMetadata({
customer_id,
customer_name,
user_id,
username,
});
return this.catalogService.getCustomPropertyDefinitions(metadata);
}
@Get('data-asset/:id') @Get('data-asset/:id')
@RequireSomePermission( @RequireSomePermission(
PERMISSIONS_GROUPS.CATALOG.permissions.GET, PERMISSIONS_GROUPS.CATALOG.permissions.GET,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async getDataAsset( async getDataAsset(
@User() user: RequestUser, @User() user: RequestUser,
@Param('id') id: string, @Param('id') id: string,
@@ -419,9 +387,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.GET, PERMISSIONS_GROUPS.CATALOG.permissions.GET,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async getDataAssetColumnsMetadata( async getDataAssetColumnsMetadata(
@User() user: RequestUser, @User() user: RequestUser,
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@@ -453,9 +418,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.GET, PERMISSIONS_GROUPS.CATALOG.permissions.GET,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async getDataAssetPreview( async getDataAssetPreview(
@User() user: RequestUser, @User() user: RequestUser,
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@@ -487,9 +449,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.GET, PERMISSIONS_GROUPS.CATALOG.permissions.GET,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async getDataAssetDocs( async getDataAssetDocs(
@User() user: RequestUser, @User() user: RequestUser,
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@@ -521,9 +480,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE, PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async updateDataAsset( async updateDataAsset(
@User() user: RequestUser, @User() user: RequestUser,
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@@ -559,9 +515,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.CERTIFY, PERMISSIONS_GROUPS.CATALOG.permissions.CERTIFY,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async updateDataAssetCertificationStatus( async updateDataAssetCertificationStatus(
@User() user: RequestUser, @User() user: RequestUser,
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@@ -589,9 +542,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE, PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async manageDataAssetDocs( async manageDataAssetDocs(
@User() user: RequestUser, @User() user: RequestUser,
@Headers() headers, @Headers() headers,
@@ -629,9 +579,6 @@ export class CatalogController {
@ApiInternalOnlyEndpoint() @ApiInternalOnlyEndpoint()
@Put('data-asset/:id/manage-permissions') @Put('data-asset/:id/manage-permissions')
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async manageDataAssetPermissions( async manageDataAssetPermissions(
@Param('id') id: string, @Param('id') id: string,
@User() user: RequestUser, @User() user: RequestUser,
@@ -654,9 +601,6 @@ export class CatalogController {
@ApiInternalOnlyEndpoint() @ApiInternalOnlyEndpoint()
@Put('data-asset/:id/revoke-permissions') @Put('data-asset/:id/revoke-permissions')
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async revokeDataAssetPermissions( async revokeDataAssetPermissions(
@Param('id') id: string, @Param('id') id: string,
@User() user: RequestUser, @User() user: RequestUser,
@@ -682,9 +626,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.CREATE, PERMISSIONS_GROUPS.CATALOG.permissions.CREATE,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async createDataAsset( async createDataAsset(
@User() user: RequestUser, @User() user: RequestUser,
@Body() body: ICreateDataAsset, @Body() body: ICreateDataAsset,
@@ -709,9 +650,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE, PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async commentOnDataAsset( async commentOnDataAsset(
@Param('id') id: string, @Param('id') id: string,
@User() user: RequestUser, @User() user: RequestUser,
@@ -738,9 +676,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.DELETE, PERMISSIONS_GROUPS.CATALOG.permissions.DELETE,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async deleteDataAsset(@Param('id') id: string, @User() user: RequestUser) { async deleteDataAsset(@Param('id') id: string, @User() user: RequestUser) {
const { customer_id, customer_name, user_id, username } = user; const { customer_id, customer_name, user_id, username } = user;
const metadata = PackTheMetadata({ const metadata = PackTheMetadata({
@@ -762,9 +697,6 @@ export class CatalogController {
PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE, PERMISSIONS_GROUPS.CATALOG.permissions.UPDATE,
PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER, PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async deleteComment( async deleteComment(
@Param('id') id: string, @Param('id') id: string,
@User() user: RequestUser, @User() user: RequestUser,
@@ -918,9 +850,6 @@ export class CatalogController {
@Get('nimbus-dashboards') @Get('nimbus-dashboards')
@RequireAllPermissions(PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER) @RequireAllPermissions(PERMISSIONS_GROUPS.CATALOG.permissions.DATA_MANAGER)
@RequireModule(
DADOSFERA_MODULES_KEYS.CATALOG
)
async getNimbusDashboards( async getNimbusDashboards(
@User() user: RequestUser, @User() user: RequestUser,
@Body() body: GetNimbusDashboardsRequest, @Body() body: GetNimbusDashboardsRequest,
-4
View File
@@ -120,10 +120,6 @@ class CatalogService implements OnModuleInit {
} }
} }
async getCustomPropertyDefinitions(metadata: Metadata) {
return lastValueFrom(this.catalogReadService.GetCustomPropertyDefinitions({}, metadata));
}
async createDataAsset(data: Messages.CreateDataAssetRequest, metadata) { async createDataAsset(data: Messages.CreateDataAssetRequest, metadata) {
this.logger.info('CatalogService - Manage Data assets permissions'); this.logger.info('CatalogService - Manage Data assets permissions');
if (!data.embed) data.embed = undefined; if (!data.embed) data.embed = undefined;
+1 -29
View File
@@ -1,10 +1,5 @@
import { ApiProperty, ApiPropertyOptional, PickType } from '@nestjs/swagger'; import { ApiProperty, ApiPropertyOptional, PickType } from '@nestjs/swagger';
import { import { IsEnum } from 'class-validator';
IsEnum,
IsNotEmpty,
IsOptional,
IsString,
} from 'class-validator';
import { CreateDataAssetRequest } from '@dadosfera/protospack-v2/dist/lib/Catalog/interfaces/messages'; import { CreateDataAssetRequest } from '@dadosfera/protospack-v2/dist/lib/Catalog/interfaces/messages';
export enum DataAssetShareType { export enum DataAssetShareType {
@@ -203,27 +198,6 @@ export class IData {
day_opening: number; day_opening: number;
} }
export enum CustomPropertyType {
TEXT = 'text',
NUMBER = 'number',
DATE = 'date',
BOOLEAN = 'boolean',
}
export class CustomPropertyDto {
@ApiProperty()
key: string;
@ApiProperty()
value: string;
@ApiProperty({ enum: CustomPropertyType })
type: CustomPropertyType;
@ApiPropertyOptional()
color?: string;
@ApiPropertyOptional()
emoji?: string;
}
export class IUpdateDataRequest { export class IUpdateDataRequest {
@ApiProperty() @ApiProperty()
name: string; name: string;
@@ -237,8 +211,6 @@ export class IUpdateDataRequest {
share_type?: DataAssetShareType; share_type?: DataAssetShareType;
@ApiPropertyOptional() @ApiPropertyOptional()
docs?: string; docs?: string;
@ApiPropertyOptional({ type: [CustomPropertyDto] })
custom_properties?: CustomPropertyDto[];
} }
export class IUpdateCertificationStatusRequest { export class IUpdateCertificationStatusRequest {
@@ -6,9 +6,9 @@ import {
} from '@nestjs/microservices'; } from '@nestjs/microservices';
import { ConnectionTest } from '@dadosfera/protospack-v2'; import { ConnectionTest } from '@dadosfera/protospack-v2';
const infactoryUrl = process.env.INFACTORY_URL ?? '';
const isLocalConnection = const isLocalConnection =
process.env.INFACTORY_URL.startsWith('in-factory:') || infactoryUrl.startsWith('in-factory:') || infactoryUrl.includes('0.0.0.0');
process.env.INFACTORY_URL.includes('0.0.0.0');
export class ConnectionTestClientConfiguration { export class ConnectionTestClientConfiguration {
private config: GrpcOptions = { private config: GrpcOptions = {
@@ -27,19 +27,15 @@ import {
RefreshCatalogStatusReq, RefreshCatalogStatusReq,
} from './dto/connection-test'; } from './dto/connection-test';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { Authenticated, RequireModule } from 'src/decorators/authentication.decorator'; import { Authenticated } from 'src/decorators/authentication.decorator';
import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter'; import { GrpcToHttpExceptionFilter } from 'src/error/grpc-to-http-exception.filter';
import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator'; import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
import { DADOSFERA_MODULES_KEYS } from 'src/authentication/permissions.enum';
@ApiInternalOnlyController() @ApiInternalOnlyController()
@ApiTags('Connection Test') @ApiTags('Connection Test')
@Controller('connection-test') @Controller('connection-test')
@UseFilters(new GrpcToHttpExceptionFilter()) @UseFilters(new GrpcToHttpExceptionFilter())
@Authenticated() @Authenticated()
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
export class ConnectionTestController { export class ConnectionTestController {
logger: any; logger: any;
constructor( constructor(
+2 -2
View File
@@ -6,9 +6,9 @@ import {
} from '@nestjs/microservices'; } from '@nestjs/microservices';
import { ConnectionManager } from '@dadosfera/protospack-v2'; import { ConnectionManager } from '@dadosfera/protospack-v2';
const infactoryUrl = process.env.INFACTORY_URL ?? '';
const isLocalConnection = const isLocalConnection =
process.env.INFACTORY_URL.startsWith('in-factory:') || infactoryUrl.startsWith('in-factory:') || infactoryUrl.includes('0.0.0.0');
process.env.INFACTORY_URL.includes('0.0.0.0');
export class ConnectionClientConfiguration { export class ConnectionClientConfiguration {
public name = 'ConnectionClientConfiguration'; public name = 'ConnectionClientConfiguration';
@@ -16,9 +16,8 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { import {
Authenticated, Authenticated,
RequireAllPermissions, RequireAllPermissions,
RequireModule,
} from 'src/decorators/authentication.decorator'; } from 'src/decorators/authentication.decorator';
import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum'; import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
import { RequestUser, User } from 'src/decorators/user.decorator'; import { RequestUser, User } from 'src/decorators/user.decorator';
import { ValidationPipe } from '../../pipes/object-validation.pipe'; import { ValidationPipe } from '../../pipes/object-validation.pipe';
import { import {
@@ -40,9 +39,6 @@ const connectionPermissions = PERMISSIONS_GROUPS.CONNECTION.permissions;
@ApiTags('connections') @ApiTags('connections')
@Authenticated() @Authenticated()
@Controller('connections') @Controller('connections')
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
export class ConnectionController { export class ConnectionController {
logger: any; logger: any;
constructor( constructor(
+2 -2
View File
@@ -6,9 +6,9 @@ import {
} from '@nestjs/microservices'; } from '@nestjs/microservices';
import { ConnectorManager } from '@dadosfera/protospack-v2'; import { ConnectorManager } from '@dadosfera/protospack-v2';
const infactoryUrl = process.env.INFACTORY_URL ?? '';
const isLocalConnection = const isLocalConnection =
process.env.INFACTORY_URL.startsWith('in-factory:') || infactoryUrl.startsWith('in-factory:') || infactoryUrl.includes('0.0.0.0');
process.env.INFACTORY_URL.includes('0.0.0.0');
export class ConnectorClientConfiguration { export class ConnectorClientConfiguration {
public name = 'ConnectorClientConfiguration'; public name = 'ConnectorClientConfiguration';
+1 -26
View File
@@ -25,10 +25,9 @@ import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { import {
Authenticated, Authenticated,
RequireAllPermissions, RequireAllPermissions,
RequireModule,
RequireSomePermission, RequireSomePermission,
} from 'src/decorators/authentication.decorator'; } from 'src/decorators/authentication.decorator';
import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum'; import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
import { Language } from 'src/decorators/language.decorator'; import { Language } from 'src/decorators/language.decorator';
import { LanguageEnum } from 'src/utils/languages.enum'; import { LanguageEnum } from 'src/utils/languages.enum';
import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator'; import { ApiInternalOnlyController } from 'src/decorators/swagger.decorator';
@@ -100,9 +99,6 @@ export class ConnectorController {
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE, PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE, PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
async getAllConnectors( async getAllConnectors(
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@Query() queries: GetAllDto, @Query() queries: GetAllDto,
@@ -135,9 +131,6 @@ export class ConnectorController {
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE, PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE, PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
async getConnectorsTags() { async getConnectorsTags() {
return await this.connectorClientService.getConnectorsTags(); return await this.connectorClientService.getConnectorsTags();
} }
@@ -150,9 +143,6 @@ export class ConnectorController {
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE, PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE, PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
async getConnector( async getConnector(
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@Param('plugin') plugin: string, @Param('plugin') plugin: string,
@@ -181,9 +171,6 @@ export class ConnectorController {
PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE, PERMISSIONS_GROUPS.PIPELINE.permissions.UPDATE,
PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE, PERMISSIONS_GROUPS.PIPELINE.permissions.DELETE,
) )
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
async getConnectorDetails( async getConnectorDetails(
@Language() language: LanguageEnum, @Language() language: LanguageEnum,
@Param('plugin') plugin: string, @Param('plugin') plugin: string,
@@ -206,9 +193,6 @@ export class ConnectorController {
@Put('/:plugin') @Put('/:plugin')
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE) @RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
@ApiConsumes('multipart/form-data') @ApiConsumes('multipart/form-data')
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
async updateConnector( async updateConnector(
@Param('plugin') plugin: string, @Param('plugin') plugin: string,
@Body() body: UpdateDto, @Body() body: UpdateDto,
@@ -230,9 +214,6 @@ export class ConnectorController {
@Put('/:plugin/add-tag') @Put('/:plugin/add-tag')
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE) @RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
async addTagOnConnector( async addTagOnConnector(
@Param('plugin') plugin: string, @Param('plugin') plugin: string,
@Body() body: AddTagDto, @Body() body: AddTagDto,
@@ -260,9 +241,6 @@ export class ConnectorController {
@Put('/:plugin/remove-tag') @Put('/:plugin/remove-tag')
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE) @RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.UPDATE)
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
async removeTagOnConnector( async removeTagOnConnector(
@Param('plugin') plugin: string, @Param('plugin') plugin: string,
@Body() body: RemoveTagDto, @Body() body: RemoveTagDto,
@@ -291,9 +269,6 @@ export class ConnectorController {
@Delete('/:plugin') @Delete('/:plugin')
@RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.DELETE) @RequireAllPermissions(PERMISSIONS_GROUPS.CONNECTORS.permissions.DELETE)
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
async deleteConnector( async deleteConnector(
@Param('plugin') plugin: string, @Param('plugin') plugin: string,
@Query('version') version: string, @Query('version') version: string,
+2 -2
View File
@@ -6,9 +6,9 @@ import {
type GrpcOptions, type GrpcOptions,
} from '@nestjs/microservices'; } from '@nestjs/microservices';
const infactoryUrl = process.env.INFACTORY_URL ?? '';
const isLocalConnection = const isLocalConnection =
process.env.INFACTORY_URL.startsWith('in-factory:') || infactoryUrl.startsWith('in-factory:') || infactoryUrl.includes('0.0.0.0');
process.env.INFACTORY_URL.includes('0.0.0.0');
export class InputsGrpcClient { export class InputsGrpcClient {
public readonly name = 'InputsGrpcClient'; public readonly name = 'InputsGrpcClient';
private config: GrpcOptions = { private config: GrpcOptions = {
+4 -5
View File
@@ -23,7 +23,6 @@ import {
} from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/messages'; } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/messages';
import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entities'; import { Info } from '@dadosfera/protospack-v2/dist/lib/Input/interfaces/entities';
import { CreateInputReq } from './dtos/input.model'; import { CreateInputReq } from './dtos/input.model';
import { Metadata } from '@grpc/grpc-js';
@Injectable() @Injectable()
@@ -74,10 +73,10 @@ export class InputsService {
objectCamelToSnake(createInputResponse); objectCamelToSnake(createInputResponse);
return createInputResponse; return createInputResponse;
}, },
update: async (updateInputDTO: UpdateInputRequest, metadata: Metadata): Promise<InputUpdateResponse> => { update: async (updateInputDTO: UpdateInputRequest): Promise<InputUpdateResponse> => {
this.logger.info('InputClientService - Update' + JSON.stringify(updateInputDTO)); this.logger.info('InputClientService - Update' + JSON.stringify(updateInputDTO));
const updateInputResponse = await lastValueFrom( const updateInputResponse = await lastValueFrom(
this.inputWriteService.InputUpdate(updateInputDTO, metadata), this.inputWriteService.InputUpdate(updateInputDTO),
); );
return updateInputResponse; return updateInputResponse;
@@ -207,7 +206,7 @@ export class InputsService {
return findOneInputResponse; return findOneInputResponse;
} }
async update(id: string, data, info: Info, metadata?: Metadata) { async update(id: string, data, info: Info) {
// this.validateCron({ ...data, info }); // this.validateCron({ ...data, info });
try { try {
const { const {
@@ -218,7 +217,7 @@ export class InputsService {
id, id,
...data, ...data,
info, info,
}, metadata); });
const updateInputResponse = this.adjustInputPayload( const updateInputResponse = this.adjustInputPayload(
input, input,
@@ -6,9 +6,9 @@ import {
} from '@nestjs/microservices'; } from '@nestjs/microservices';
import { NetworkConfig } from '@dadosfera/protospack-v2'; import { NetworkConfig } from '@dadosfera/protospack-v2';
const infactoryUrl = process.env.INFACTORY_URL ?? '';
const isLocalConnection = const isLocalConnection =
process.env.INFACTORY_URL.startsWith('in-factory:') || infactoryUrl.startsWith('in-factory:') || infactoryUrl.includes('0.0.0.0');
process.env.INFACTORY_URL.includes('0.0.0.0');
export class NetworkConfigGrpcClient { export class NetworkConfigGrpcClient {
public name = 'NetworkConfigGrpcClient'; public name = 'NetworkConfigGrpcClient';
@@ -1,6 +1,6 @@
import { ClientsModule } from '@nestjs/microservices'; import { ClientsModule } from '@nestjs/microservices';
import { Test, TestingModule } from '@nestjs/testing'; import { Test, TestingModule } from '@nestjs/testing';
// import { DucClient } from '../duc/client.config' // import { DucClient } from 'src/clients/duc/client.config';
import { PermissionsController } from './permissions.controller'; import { PermissionsController } from './permissions.controller';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { PermissionsService } from './permissions.service'; import { PermissionsService } from './permissions.service';
@@ -22,7 +22,7 @@ describe.skip('PermissionsController', () => {
provide: DadosferaLogger, provide: DadosferaLogger,
useValue: { logger }, useValue: { logger },
}, },
PermissionsService PermissionsService,
], ],
}).compile(); }).compile();
@@ -25,10 +25,9 @@ import {
} from '@nestjs/swagger'; } from '@nestjs/swagger';
import { import {
RequireAllPermissions, RequireAllPermissions,
RequireModule,
RequireSomePermission, RequireSomePermission,
} from 'src/decorators/authentication.decorator'; } from 'src/decorators/authentication.decorator';
import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from '../../authentication/permissions.enum'; import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
import { PipelinesService } from './pipelines.service'; import { PipelinesService } from './pipelines.service';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { Messages } from '@dadosfera/protospack-v2/dist/lib/PipelineV2'; import { Messages } from '@dadosfera/protospack-v2/dist/lib/PipelineV2';
@@ -58,9 +57,6 @@ type PipelineTablesConfig = { input_id?: string; tables: PipelineTable[] };
@ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }]) @ApiHeaders([{ name: 'dadosfera-lang', enum: LanguageEnum, required: false }])
@UseFilters(new GrpcToHttpExceptionFilter()) @UseFilters(new GrpcToHttpExceptionFilter())
@Controller('pipelinesV2') @Controller('pipelinesV2')
@RequireModule(
DADOSFERA_MODULES_KEYS.COLLECT
)
export class PipelinesController { export class PipelinesController {
logger: DadosferaLogger; logger: DadosferaLogger;
constructor( constructor(
@@ -321,6 +317,7 @@ export class PipelinesController {
) { ) {
this.logger.info('PipelinesController - update', { user }); this.logger.info('PipelinesController - update', { user });
const { customer_id, customer_name, user_id, username } = user;
const info: Info = { const info: Info = {
user_id: user.user_id, user_id: user.user_id,
customer: user.customer_name, customer: user.customer_name,
@@ -328,7 +325,13 @@ export class PipelinesController {
pipeline_id: pipelineId pipeline_id: pipelineId
}; };
const metadata = PackTheMetadata(user); const metadata = PackTheMetadata({
customer_id,
customer_name,
user_id,
username,
language,
});
const response = await this.pipelinesClientService.updatePipelineInput( const response = await this.pipelinesClientService.updatePipelineInput(
pipelineId, pipelineId,
+28 -31
View File
@@ -383,8 +383,7 @@ export class PipelinesService implements OnModuleInit {
const updateInputResponse = await this.inputsService.update( const updateInputResponse = await this.inputsService.update(
inputId, inputId,
updateInputDTO, updateInputDTO,
info, info
metadata
); );
const inputRollback = () => { const inputRollback = () => {
@@ -405,36 +404,34 @@ export class PipelinesService implements OnModuleInit {
const nimbusUpdates = updateInputResponse?.tablesUpdate || []; const nimbusUpdates = updateInputResponse?.tablesUpdate || [];
if (user.customer_modules.includes('catalog')) { nimbusUpdates.forEach(update => {
nimbusUpdates.forEach(update => { const nimbusRollback = () => {
const nimbusRollback = () => { return this.nimbusService.renameTable(
return this.nimbusService.renameTable( info.customer,
info.customer, update.database,
update.database, {
{ table_name: update.table_name,
table_name: update.table_name, table_schema: update.table_schema
table_schema: update.table_schema },
}, {
{ table_name: update.old_table_name,
table_name: update.old_table_name, table_schema: update.old_table_schema
table_schema: update.old_table_schema }
} );
);
}
rollback.push(nimbusRollback);
});
try {
await this.updateNimbus(info.customer, nimbusUpdates);
} catch (error) {
this.logger.error(error);
if (error instanceof AxiosError) {
this.logger.error(JSON.stringify(error.response.data));
}
await this.executeRenameRollback(rollback);
throw new Error("Error Nimbus updating tables");
} }
rollback.push(nimbusRollback);
});
try {
await this.updateNimbus(info.customer, nimbusUpdates);
} catch (error) {
this.logger.error(error);
if (error instanceof AxiosError) {
this.logger.error(JSON.stringify(error.response.data));
}
await this.executeRenameRollback(rollback);
throw new Error("Error Nimbus updating tables");
} }
try { try {
@@ -14,17 +14,16 @@ import {
NotFoundException, NotFoundException,
UseGuards, UseGuards,
} from '@nestjs/common'; } from '@nestjs/common';
import { ApiTags, ApiOperation, ApiOkResponse } from '@nestjs/swagger'; import { ApiTags, ApiOperation } from '@nestjs/swagger';
import { DadosferaLogger } from '@dadosfera/dadosfera-logs'; import { DadosferaLogger } from '@dadosfera/dadosfera-logs';
import { import {
Authenticated, Authenticated,
RequireAllPermissions, RequireAllPermissions,
RequireModule,
} from '../../decorators/authentication.decorator'; } from '../../decorators/authentication.decorator';
import { User, RequestUser } from '../../decorators/user.decorator'; import { User, RequestUser } from '../../decorators/user.decorator';
import { PlatformApiService } from './platform-api.service'; import { PlatformApiService } from './platform-api.service';
import { DADOSFERA_MODULES_KEYS, PERMISSIONS_GROUPS } from '../../authentication/permissions.enum'; import { PERMISSIONS_GROUPS } from '../../authentication/permissions.enum';
import { ElasticsearchService } from '../../services/elasticsearch'; import { ElasticsearchService } from '../../services/elasticsearch';
import { DynamoDBService, ReferenceColumn } from '../../services/dynamodb'; import { DynamoDBService, ReferenceColumn } from '../../services/dynamodb';
import { CustomersService } from '../customers/customers.service'; import { CustomersService } from '../customers/customers.service';
@@ -50,7 +49,6 @@ type RenameTablesBody = {
@ApiTags('Platform API') @ApiTags('Platform API')
@Controller('platform') @Controller('platform')
@RequireModule(DADOSFERA_MODULES_KEYS.COLLECT)
export class PlatformApiController { export class PlatformApiController {
private logger: any; private logger: any;
@@ -74,10 +72,6 @@ export class PlatformApiController {
return id?.replace(/-/g, '_') || ''; return id?.replace(/-/g, '_') || '';
} }
private decodePathParam(value: string): string {
return value ? decodeURIComponent(value) : '';
}
/** /**
* Denormalize ID back to UUID format (replace _ with -). * Denormalize ID back to UUID format (replace _ with -).
* Used when we receive a normalized ID but need the original UUID. * Used when we receive a normalized ID but need the original UUID.
@@ -838,40 +832,6 @@ export class PlatformApiController {
); );
} }
@Get('pipelines/:pipelineId/pipeline_run/:runId/jobs')
@ApiOperation({
summary: 'Get pipeline run jobs',
description: 'Proxies platform-api DB-backed job runs and returns `{ jobs: [...] }`.',
})
@ApiOkResponse({
description: 'DB-backed job runs for the selected pipeline run.',
schema: {
type: 'object',
properties: {
jobs: {
type: 'array',
items: { type: 'object' },
},
},
required: ['jobs'],
},
})
@RequireAllPermissions(PERMISSIONS_GROUPS.PIPELINE.permissions.GET)
async getPipelineRunJobs(
@Param('pipelineId') pipelineId: string,
@Param('runId') runId: string,
@User() user: RequestUser,
) {
const normalizedPipelineId = this.normalizePipelineId(pipelineId);
const decodedRunId = this.decodePathParam(runId);
return this.platformApiService.proxy(
'GET',
`/pipeline/${normalizedPipelineId}/pipeline_run/${decodedRunId}/jobs`,
user,
);
}
// ==================== JOBS - COLUMN EDITING ROUTES ==================== // ==================== JOBS - COLUMN EDITING ROUTES ====================
@Put('jobs/:jobId/input') @Put('jobs/:jobId/input')
@@ -5,21 +5,11 @@ import DadosferaLogger from '@dadosfera/dadosfera-logs';
describe('ReleaseNoteController', () => { describe('ReleaseNoteController', () => {
let controller: ReleaseNoteController; let controller: ReleaseNoteController;
const logger = {
info: (...args) => args,
error: (...args) => args,
};
beforeEach(async () => { beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({ const module: TestingModule = await Test.createTestingModule({
controllers: [ReleaseNoteController], controllers: [ReleaseNoteController],
providers: [ providers: [ReleaseNoteService, DadosferaLogger],
{
provide: DadosferaLogger,
useValue: { logger },
},
ReleaseNoteService
],
}).compile(); }).compile();
controller = module.get<ReleaseNoteController>(ReleaseNoteController); controller = module.get<ReleaseNoteController>(ReleaseNoteController);
@@ -4,20 +4,10 @@ import DadosferaLogger from '@dadosfera/dadosfera-logs';
describe('ReleaseNoteService', () => { describe('ReleaseNoteService', () => {
let service: ReleaseNoteService; let service: ReleaseNoteService;
const logger = {
info: (...args) => args,
error: (...args) => args,
};
beforeEach(async () => { beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({ const module: TestingModule = await Test.createTestingModule({
providers: [ providers: [ReleaseNoteService, DadosferaLogger],
{
provide: DadosferaLogger,
useValue: { logger },
},
ReleaseNoteService
],
}).compile(); }).compile();
service = module.get<ReleaseNoteService>(ReleaseNoteService); service = module.get<ReleaseNoteService>(ReleaseNoteService);
@@ -6,9 +6,9 @@ import {
import { credentials } from '@grpc/grpc-js'; import { credentials } from '@grpc/grpc-js';
import { Transformation } from '@dadosfera/protospack-v2'; import { Transformation } from '@dadosfera/protospack-v2';
const infactoryUrl = process.env.INFACTORY_URL ?? '';
const isLocalConnection = const isLocalConnection =
process.env.INFACTORY_URL.startsWith('in-factory:') || infactoryUrl.startsWith('in-factory:') || infactoryUrl.includes('0.0.0.0');
process.env.INFACTORY_URL.includes('0.0.0.0');
export class TransformationsClientConfiguration { export class TransformationsClientConfiguration {
public name = 'TransformationsClientConfiguration'; public name = 'TransformationsClientConfiguration';
-1
View File
@@ -9,7 +9,6 @@ interface IMetadata {
details?: string; details?: string;
sensitive?: string; sensitive?: string;
roles?: string[]; roles?: string[];
customer_modules?: string[];
is_data_manager?: boolean; is_data_manager?: boolean;
access_token?: string; access_token?: string;
host?: string; host?: string;
+1 -1
View File
@@ -1,4 +1,4 @@
{ {
"extends": "./tsconfig.json", "extends": "./tsconfig.json",
"exclude": ["node_modules", "test", "dist", "**/*spec.ts", "jest.*.ts"] "exclude": ["node_modules", "test", "dist", "**/*spec.ts", "jest.config.ts"]
} }