@orcabus/platform-cdk-constructs 0.0.49 → 0.0.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.jsii +2 -2
- package/api-gateway/api-gateway.js +1 -1
- package/deployment-stack-pipeline/artifact-bucket.js +1 -1
- package/deployment-stack-pipeline/pipeline.js +1 -1
- package/dynamodb/index.js +2 -2
- package/ecs/index.js +1 -1
- package/lambda/index.js +1 -1
- package/lambda/layers/icav2_tools/poetry.lock +1085 -8
- package/lambda/layers/icav2_tools/pyproject.toml +8 -3
- package/lambda/layers/orcabus_api_tools/src/orcabus_api_tools/data_sharing/models.py +2 -1
- package/lambda/layers/orcabus_api_tools/src/orcabus_api_tools/fastq/query_helpers.py +3 -0
- package/lambda/layers/orcabus_api_tools/src/orcabus_api_tools/utils/requests_helpers.py +15 -1
- package/monitored-queue/index.js +1 -1
- package/named-lambda-role/index.js +1 -1
- package/package.json +1 -1
- package/provider-function/index.js +1 -1
- package/shared-config/networking.js +2 -2
- package/shared-config/slack.js +1 -1
|
@@ -14,8 +14,8 @@ homepage = "https://github.com/orcabus/platform-cdk-constructs"
|
|
|
14
14
|
repository = "https://github.com/orcabus/platform-cdk-constructs"
|
|
15
15
|
|
|
16
16
|
[tool.poetry.dependencies]
|
|
17
|
-
python = "
|
|
18
|
-
wrapica = "2.
|
|
17
|
+
python = ">3.12,<3.13"
|
|
18
|
+
wrapica = "2.37.0.dev20250731075657"
|
|
19
19
|
|
|
20
20
|
[tool.poetry.group.dev]
|
|
21
21
|
optional = true
|
|
@@ -23,4 +23,9 @@ optional = true
|
|
|
23
23
|
[tool.poetry.group.dev.dependencies]
|
|
24
24
|
pytest = "^7.0.0" # For testing only
|
|
25
25
|
# For typehinting only, not required at runtime
|
|
26
|
-
mypy-boto3-secretsmanager = "
|
|
26
|
+
mypy-boto3-secretsmanager = ">=1.34.0, <2"
|
|
27
|
+
|
|
28
|
+
[[tool.poetry.source]]
|
|
29
|
+
name = "testpypi"
|
|
30
|
+
url = "https://test.pypi.org/simple/"
|
|
31
|
+
priority = "supplemental"
|
|
@@ -18,12 +18,15 @@ get_fastqs_in_project
|
|
|
18
18
|
get_fastq_by_rgid
|
|
19
19
|
|
|
20
20
|
"""
|
|
21
|
+
|
|
22
|
+
# Standard imports
|
|
21
23
|
from functools import reduce
|
|
22
24
|
from itertools import batched
|
|
23
25
|
from operator import concat
|
|
24
26
|
from typing import List, Unpack
|
|
25
27
|
from fastapi.encoders import jsonable_encoder
|
|
26
28
|
|
|
29
|
+
# Local imports
|
|
27
30
|
from . import get_fastq_request_response_results, get_fastq_request
|
|
28
31
|
from .globals import FASTQ_ENDPOINT, FASTQ_SET_ENDPOINT, RGID_ENDPOINT
|
|
29
32
|
from .models import (
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env python3
|
|
2
|
+
import json
|
|
2
3
|
from typing import Dict, Optional, List, Union
|
|
3
4
|
from urllib.parse import urlunparse, unquote
|
|
4
5
|
|
|
@@ -7,6 +8,7 @@ import requests
|
|
|
7
8
|
import logging
|
|
8
9
|
from copy import deepcopy
|
|
9
10
|
|
|
11
|
+
from fastapi.encoders import jsonable_encoder
|
|
10
12
|
from requests import HTTPError
|
|
11
13
|
|
|
12
14
|
# Locals
|
|
@@ -62,12 +64,24 @@ def get_request_response_results(url: str, params: Optional[Dict] = None) -> Lis
|
|
|
62
64
|
params if params is not None else {}
|
|
63
65
|
)
|
|
64
66
|
|
|
67
|
+
# Iterate through each of the params, if any of the values
|
|
68
|
+
# are boolean, convert them to strings via json.dumps
|
|
69
|
+
req_params = dict(map(
|
|
70
|
+
lambda kv_iter_: (
|
|
71
|
+
kv_iter_[0], (
|
|
72
|
+
json.dumps(kv_iter_[1])
|
|
73
|
+
if isinstance(kv_iter_[1], bool)
|
|
74
|
+
else kv_iter_[1]
|
|
75
|
+
)
|
|
76
|
+
),
|
|
77
|
+
req_params.items()
|
|
78
|
+
))
|
|
65
79
|
|
|
66
80
|
# Make the request
|
|
67
81
|
response = requests.get(
|
|
68
82
|
url,
|
|
69
83
|
headers=headers,
|
|
70
|
-
params=req_params
|
|
84
|
+
params=jsonable_encoder(req_params)
|
|
71
85
|
)
|
|
72
86
|
|
|
73
87
|
response.raise_for_status()
|
package/monitored-queue/index.js
CHANGED
|
@@ -13,7 +13,7 @@ const aws_cloudwatch_actions_1 = require("aws-cdk-lib/aws-cloudwatch-actions");
|
|
|
13
13
|
* SNS topic.
|
|
14
14
|
*/
|
|
15
15
|
class MonitoredQueue extends constructs_1.Construct {
|
|
16
|
-
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.monitoredQueue.MonitoredQueue", version: "0.0.
|
|
16
|
+
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.monitoredQueue.MonitoredQueue", version: "0.0.51" };
|
|
17
17
|
queue;
|
|
18
18
|
deadLetterQueue;
|
|
19
19
|
alarm;
|
|
@@ -7,7 +7,7 @@ const aws_iam_1 = require("aws-cdk-lib/aws-iam");
|
|
|
7
7
|
* A construct which represents a named role that a Lambda function can assume.
|
|
8
8
|
*/
|
|
9
9
|
class NamedLambdaRole extends aws_iam_1.Role {
|
|
10
|
-
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.namedLambdaRole.NamedLambdaRole", version: "0.0.
|
|
10
|
+
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.namedLambdaRole.NamedLambdaRole", version: "0.0.51" };
|
|
11
11
|
constructor(scope, id, props) {
|
|
12
12
|
super(scope, id, {
|
|
13
13
|
assumedBy: new aws_iam_1.ServicePrincipal("lambda.amazonaws.com"),
|
package/package.json
CHANGED
|
@@ -15,7 +15,7 @@ const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
|
15
15
|
* to the provider framework.
|
|
16
16
|
*/
|
|
17
17
|
class ProviderFunction extends constructs_1.Construct {
|
|
18
|
-
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.provider.ProviderFunction", version: "0.0.
|
|
18
|
+
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.provider.ProviderFunction", version: "0.0.51" };
|
|
19
19
|
_function;
|
|
20
20
|
_response;
|
|
21
21
|
constructor(scope, id, props) {
|
|
@@ -23,7 +23,7 @@ exports.VPC_LOOKUP_PROPS = {
|
|
|
23
23
|
* Helper for looking up the shared OrcaBus VPC.
|
|
24
24
|
*/
|
|
25
25
|
class OrcaBusVpc {
|
|
26
|
-
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.sharedConfig.networking.OrcaBusVpc", version: "0.0.
|
|
26
|
+
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.sharedConfig.networking.OrcaBusVpc", version: "0.0.51" };
|
|
27
27
|
/**
|
|
28
28
|
* The shared VPC that is used by OrcaBus.
|
|
29
29
|
* @param scope
|
|
@@ -42,7 +42,7 @@ exports.SHARED_SECURITY_GROUP_NAME = "OrcaBusSharedComputeSecurityGroup";
|
|
|
42
42
|
* Helper for looking up the shared compute security group by name.
|
|
43
43
|
*/
|
|
44
44
|
class OrcaBusSharedComputeSecurityGroup {
|
|
45
|
-
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.sharedConfig.networking.OrcaBusSharedComputeSecurityGroup", version: "0.0.
|
|
45
|
+
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.sharedConfig.networking.OrcaBusSharedComputeSecurityGroup", version: "0.0.51" };
|
|
46
46
|
/**
|
|
47
47
|
* The shared security group that is used by compute resources to access the database.
|
|
48
48
|
* @param scope
|
package/shared-config/slack.js
CHANGED
|
@@ -11,7 +11,7 @@ exports.SLACK_ALERTS_SNS_TOPIC = "AwsChatBotTopic-alerts";
|
|
|
11
11
|
* A helper class to construct the arn for the slack SNS topic.
|
|
12
12
|
*/
|
|
13
13
|
class SlackAlerts {
|
|
14
|
-
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.sharedConfig.slack.SlackAlerts", version: "0.0.
|
|
14
|
+
static [JSII_RTTI_SYMBOL_1] = { fqn: "@orcabus/platform-cdk-constructs.sharedConfig.slack.SlackAlerts", version: "0.0.51" };
|
|
15
15
|
/**
|
|
16
16
|
* Format the ARN for the slack alerts SNS topic for the current stack.
|
|
17
17
|
* @param stack
|