Skip to content

Commit

Permalink
Bugfix: InitScriptInfo schema does not match REST API (#52)
Browse files Browse the repository at this point in the history 
* initscriptinfo: openapi spec does not match api key casing

* bump versions
  • Loading branch information
@mach-kernel
mach-kernel authored Aug 2, 2024
1 parent b047c00 commit 3fa9295
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 42 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions charts/databricks-kube-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: 0.8.2
appVersion: 0.8.3
name: databricks-kube-operator
description: A kube-rs operator for managing Databricks API resources
version: 0.9.3
version: 0.9.4

home: https://github.com/mach-kernel/databricks-kube-operator
sources:
Expand Down
70 changes: 36 additions & 34 deletions charts/databricks-kube-operator/templates/crds.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ spec:
- LEGACY_TABLE_ACL
- LEGACY_PASSTHROUGH
- LEGACY_SINGLE_USER
- LEGACY_SINGLE_USER_STANDARD
nullable: true
type: string
docker_image:
Expand Down Expand Up @@ -313,7 +314,23 @@ spec:
description: The configuration for storing init scripts. Any number of scripts can be specified. The scripts are executed sequentially in the order provided. If `cluster_log_conf` is specified, init script logs are sent to `<destination>/<cluster-id>/init_scripts`.
items:
properties:
S3:
dbfs:
nullable: true
properties:
destination:
description: 'DBFS destination. Example: `dbfs:/my/path`'
nullable: true
type: string
type: object
file:
nullable: true
properties:
destination:
description: 'File destination. Example: `file:/my/file.sh`'
nullable: true
type: string
type: object
s3:
nullable: true
properties:
canned_acl:
Expand Down Expand Up @@ -345,22 +362,6 @@ spec:
nullable: true
type: string
type: object
dbfs:
nullable: true
properties:
destination:
description: 'DBFS destination. Example: `dbfs:/my/path`'
nullable: true
type: string
type: object
file:
nullable: true
properties:
destination:
description: 'File destination. Example: `file:/my/file.sh`'
nullable: true
type: string
type: object
type: object
nullable: true
type: array
Expand Down Expand Up @@ -748,6 +749,7 @@ spec:
- LEGACY_TABLE_ACL
- LEGACY_PASSTHROUGH
- LEGACY_SINGLE_USER
- LEGACY_SINGLE_USER_STANDARD
nullable: true
type: string
docker_image:
Expand Down Expand Up @@ -790,7 +792,23 @@ spec:
description: The configuration for storing init scripts. Any number of scripts can be specified. The scripts are executed sequentially in the order provided. If `cluster_log_conf` is specified, init script logs are sent to `<destination>/<cluster-id>/init_scripts`.
items:
properties:
S3:
dbfs:
nullable: true
properties:
destination:
description: 'DBFS destination. Example: `dbfs:/my/path`'
nullable: true
type: string
type: object
file:
nullable: true
properties:
destination:
description: 'File destination. Example: `file:/my/file.sh`'
nullable: true
type: string
type: object
s3:
nullable: true
properties:
canned_acl:
Expand Down Expand Up @@ -822,22 +840,6 @@ spec:
nullable: true
type: string
type: object
dbfs:
nullable: true
properties:
destination:
description: 'DBFS destination. Example: `dbfs:/my/path`'
nullable: true
type: string
type: object
file:
nullable: true
properties:
destination:
description: 'File destination. Example: `file:/my/file.sh`'
nullable: true
type: string
type: object
type: object
nullable: true
type: array
Expand Down
2 changes: 1 addition & 1 deletion databricks-kube/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ path = "src/crdgen.rs"
[package]
name = "databricks_kube"
default-run = "databricks_kube"
version = "0.8.2"
version = "0.8.3"
edition = "2021"

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion databricks-rust-jobs/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "databricks_rust_jobs"
version = "2.1.2"
version = "2.1.3"
authors = ["OpenAPI Generator team and contributors"]
description = "The Jobs API allows you to create, edit, and delete jobs. You should never hard code secrets or store them in plain text. Use the [Secrets API](https://docs.databricks.com/dev-tools/api/latest/secrets.html) to manage secrets in the [Databricks CLI](https://docs.databricks.com/dev-tools/cli/index.html). Use the [Secrets utility](https://docs.databricks.com/dev-tools/databricks-utils.html#dbutils-secrets) to reference secrets in notebooks and jobs."
# Override this license by providing a License Object in the OpenAPI.
Expand Down
2 changes: 1 addition & 1 deletion databricks-rust-jobs/src/models/init_script_info.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub struct InitScriptInfo {
pub dbfs: Option<Box<crate::models::DbfsStorageInfo>>,
#[serde(rename = "file", skip_serializing_if = "Option::is_none")]
pub file: Option<Box<crate::models::FileStorageInfo>>,
#[serde(rename = "S3", skip_serializing_if = "Option::is_none")]
#[serde(rename = "s3", skip_serializing_if = "Option::is_none")]
pub s3: Option<Box<crate::models::S3StorageInfo>>,
}

Expand Down
2 changes: 1 addition & 1 deletion openapi/jobs-2.1-aws.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3759,7 +3759,7 @@ components:
File location of init script. Destination must be provided. For
example, `{ "file" : { "destination" : "file:/my/local/file.sh" } }`
$ref: '#/components/schemas/FileStorageInfo'
S3:
s3:
description: >-
S3 location of init script. Destination and either region or
endpoint must be provided. For example, `{ "s3": { "destination" :
Expand Down

0 comments on commit 3fa9295

Please sign in to comment.