Skip to content

Commit 7e4a61c

Browse files
committed
Fixed missing codeType and other tweaks.
1 parent dae09ce commit 7e4a61c

4 files changed

Lines changed: 16 additions & 5 deletions

File tree

src/datacustomcode/cli.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,16 @@ def deploy(
190190
raise click.Abort()
191191

192192
logger.debug(f"Deploying with CPU size: {cpu_size}")
193-
193+
base_directory = find_base_directory(path)
194+
package_type = get_package_type(base_directory)
194195
metadata = CodeExtensionMetadata(
195196
name=name,
196197
version=version,
197198
description=description,
198199
computeType=COMPUTE_TYPES[cpu_size],
200+
codeType=package_type,
199201
)
200202

201-
base_directory = find_base_directory(path)
202-
package_type = get_package_type(base_directory)
203203
if package_type == "function":
204204
if not function_invoke_opt:
205205
click.secho(

src/datacustomcode/deploy.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ class CodeExtensionMetadata(BaseModel):
6161
version: str
6262
description: str
6363
computeType: str
64+
codeType: str
6465
functionInvokeOptions: Union[list[str], None] = None
6566

6667
def __init__(self, **data):
@@ -161,6 +162,7 @@ def create_deployment(
161162
"description": metadata.description,
162163
"version": metadata.version,
163164
"computeType": metadata.computeType,
165+
"codeType": metadata.codeType,
164166
}
165167
)
166168
if metadata.functionInvokeOptions:
@@ -294,11 +296,11 @@ def wait_for_deployment(
294296

295297

296298
class BaseConfig(BaseModel):
297-
sdkVersion: str
298299
entryPoint: str
299300

300301

301302
class DataTransformConfig(BaseConfig):
303+
sdkVersion: str
302304
dataspace: str
303305
permissions: Permissions
304306

src/datacustomcode/scan.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
}
4545

4646
FUNCTION_CONFIG_TEMPLATE = {
47-
"sdkVersion": get_version(),
4847
"entryPoint": "",
4948
}
5049
STANDARD_LIBS = set(sys.stdlib_module_names)

tests/test_deploy.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ def test_create_deployment_success(self, mock_make_api_call):
496496
version="1.0.0",
497497
description="Test job",
498498
computeType="CPU_M",
499+
codeType="script",
499500
)
500501

501502
mock_make_api_call.return_value = {
@@ -519,6 +520,7 @@ def test_create_deployment_conflict(self, mock_make_api_call):
519520
version="1.0.0",
520521
description="Test job",
521522
computeType="CPU_M",
523+
codeType="script",
522524
)
523525

524526
# Mock HTTP error with 409 Conflict
@@ -543,6 +545,7 @@ def test_create_deployment_function_invoke_options(self, mock_make_api_call):
543545
description="Test job",
544546
computeType="CPU_M",
545547
functionInvokeOptions=["option1", "option2"],
548+
codeType="function",
546549
)
547550

548551
mock_make_api_call.return_value = {
@@ -663,6 +666,7 @@ def test_get_deployments(self, mock_make_api_call):
663666
version="1.0.0",
664667
description="Test job",
665668
computeType="CPU_M",
669+
codeType="script",
666670
)
667671

668672
mock_make_api_call.return_value = {"deploymentStatus": "Deployed"}
@@ -690,6 +694,7 @@ def test_wait_for_deployment_success(
690694
version="1.0.0",
691695
description="Test job",
692696
computeType="CPU_M",
697+
codeType="script",
693698
)
694699
callback = MagicMock()
695700

@@ -720,6 +725,7 @@ def test_wait_for_deployment_timeout(
720725
version="1.0.0",
721726
description="Test job",
722727
computeType="CPU_M",
728+
codeType="script",
723729
)
724730

725731
# Mock time to simulate timeout
@@ -800,6 +806,7 @@ def test_create_data_transform(self, mock_make_api_call, mock_get_config):
800806
version="1.0.0",
801807
description="Test job",
802808
computeType="CPU_M",
809+
codeType="script",
803810
)
804811

805812
data_transform_config = DataTransformConfig(
@@ -878,6 +885,7 @@ def test_deploy_full(
878885
version="1.0.0",
879886
description="Test job",
880887
computeType="CPU_M",
888+
codeType="script",
881889
)
882890
callback = MagicMock()
883891

@@ -918,6 +926,7 @@ def test_run_data_transform(self, mock_make_api_call):
918926
version="1.0.0",
919927
description="Test job",
920928
computeType="CPU_M",
929+
codeType="script",
921930
)
922931

923932
mock_make_api_call.return_value = {"status": "Running"}
@@ -962,6 +971,7 @@ def test_deploy_full_happy_path(
962971
version="1.0.0",
963972
description="Test job",
964973
computeType="CPU_M",
974+
codeType="script",
965975
)
966976
callback = MagicMock()
967977

0 commit comments

Comments
 (0)