diff --git a/cue/datasource/proxy/sql/sql_patch.cue b/cue/datasource/proxy/sql/sql_patch.cue index ab5f7e8..19a5dd9 100644 --- a/cue/datasource/proxy/sql/sql_patch.cue +++ b/cue/datasource/proxy/sql/sql_patch.cue @@ -30,13 +30,13 @@ import ( // options specifies command-line options to send to the server at connection start options?: string @go(Options,string) // max_conns is the maximum size of the pool - max_conns?: number @go(MaxConns,int) + maxConns?: number @go(MaxConns,int) // connect_timeout the timeout value used for socket connect operations. - connect_timeout?: common.#DurationString @go(ConnectTimeout) + connectTimeout?: common.#DurationString @go(ConnectTimeout) // prepare_threshold specifies the number of PreparedStatement executions that must occur before the driver begins using server-side prepared statements. - prepare_threshold?: number @go(PrepareThreshold,int) + prepareThreshold?: number @go(PrepareThreshold,int) // ssl_mode to use when connecting to postgres - ssl_mode?: #enumSSLMode @go(SSLMode,int) + sslMode?: #enumSSLMode @go(SSLMode,int) } #Config: { diff --git a/go/datasource/proxy/sql/sql.go b/go/datasource/proxy/sql/sql.go index 190d830..4bf7b7c 100644 --- a/go/datasource/proxy/sql/sql.go +++ b/go/datasource/proxy/sql/sql.go @@ -53,13 +53,13 @@ type MySQLConfig struct { type PostgresConfig struct { // MaxConns is the maximum size of the pool - MaxConns int32 `json:"max_conns,omitempty" yaml:"max_conns,omitempty"` + MaxConns int32 `json:"maxConns,omitempty" yaml:"maxConns,omitempty"` // ConnectTimeout the timeout value used for socket connect operations. - ConnectTimeout common.DurationString `json:"connect_timeout,omitempty" yaml:"connect_timeout,omitempty"` + ConnectTimeout common.DurationString `json:"connectTimeout,omitempty" yaml:"connectTimeout,omitempty"` // PrepareThreshold specifies the number of PreparedStatement executions that must occur before the driver begins using server-side prepared statements. - PrepareThreshold *int `json:"prepare_threshold,omitempty" yaml:"prepare_threshold,omitempty"` + PrepareThreshold *int `json:"prepareThreshold,omitempty" yaml:"prepareThreshold,omitempty"` // SSLMode to use when connecting to postgres - SSLMode SSLMode `json:"ssl_mode,omitempty" yaml:"ssl_mode,omitempty"` + SSLMode SSLMode `json:"sslMode,omitempty" yaml:"sslMode,omitempty"` // Options specifies command-line options to send to the server at connection start Options string `json:"options,omitempty" yaml:"options,omitempty"` } diff --git a/go/datasource/proxy/sql/sql_test.go b/go/datasource/proxy/sql/sql_test.go index c454497..87fa2df 100644 --- a/go/datasource/proxy/sql/sql_test.go +++ b/go/datasource/proxy/sql/sql_test.go @@ -36,7 +36,7 @@ func TestUnmarshalJSONConfig(t *testing.T) { "host": "localhost:5432", "database": "test", "postgres": { - "ssl_mode": "disable" + "sslMode": "disable" } } `, @@ -161,10 +161,10 @@ func TestUnmarshalJSONConfig(t *testing.T) { "host": "localhost:5432", "database": "test", "postgres": { - "max_conns": 50, - "connect_timeout": "5m", - "prepare_threshold": 5, - "ssl_mode": "require", + "maxConns": 50, + "connectTimeout": "5m", + "prepareThreshold": 5, + "sslMode": "require", "options": "-c search_path=myschema" } } @@ -190,7 +190,7 @@ func TestUnmarshalJSONConfig(t *testing.T) { "host": "localhost:5432", "database": "test", "postgres": { - "ssl_mode": "notreal" + "sslMode": "notreal" } } `, @@ -266,7 +266,7 @@ driver: postgres host: localhost:5432 database: test postgres: - ssl_mode: disable + sslMode: disable `, result: Config{ Driver: DriverPostgreSQL, @@ -376,7 +376,7 @@ driver: postgres host: localhost:5432 database: test postgres: - ssl_mode: verify-full + sslMode: verify-full `, result: Config{ Driver: DriverPostgreSQL, @@ -394,7 +394,7 @@ driver: postgres host: localhost:5432 database: test postgres: - ssl_mode: invalid + sslMode: invalid `, expectErr: true, }, diff --git a/java/pom.xml b/java/pom.xml index 52fa06d..94df11c 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -6,7 +6,7 @@ dev.perses spec - 0.2.0-beta.6 + 0.2.0-beta.9 jar Perses diff --git a/ts/package-lock.json b/ts/package-lock.json index 8092213..2fdbc95 100644 --- a/ts/package-lock.json +++ b/ts/package-lock.json @@ -1,12 +1,12 @@ { "name": "@perses-dev/spec", - "version": "0.2.0-beta.7", + "version": "0.2.0-beta.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@perses-dev/spec", - "version": "0.2.0-beta.7", + "version": "0.2.0-beta.9", "license": "Apache-2.0", "dependencies": { "date-fns": "^4.1.0", diff --git a/ts/package.json b/ts/package.json index cbac601..4fd967d 100644 --- a/ts/package.json +++ b/ts/package.json @@ -1,6 +1,6 @@ { "name": "@perses-dev/spec", - "version": "0.2.0-beta.7", + "version": "0.2.0-beta.9", "description": "Perses dashboard an datasource specification", "license": "Apache-2.0", "homepage": "https://github.com/perses/spec/blob/main/README.md",