Skip to content

Commit 7b7fb24

Browse files
kislerdmkislerdm
committed
up sdk
Signed-off-by: Dmitry Kisler <admin@dkisler.com>
1 parent a6d1b1a commit 7b7fb24

7 files changed

Lines changed: 21 additions & 28 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
- Added the resource `neon_org_api_key` to manage API keys on per org. level.
1313

14+
### Changed
15+
16+
- Updated dependencies:
17+
- Neon Go SDK: [v0.16.0](https://github.com/kislerdm/neon-sdk-go/compare/v0.13.0...v0.16.0)
18+
1419
## [v0.10.0] - 2025-10-12
1520

1621
### Removed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/hashicorp/terraform-plugin-log v0.9.0
99
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
1010
github.com/jackc/pgx/v5 v5.7.3
11-
github.com/kislerdm/neon-sdk-go v0.13.0
11+
github.com/kislerdm/neon-sdk-go v0.16.0
1212
github.com/stretchr/testify v1.10.0
1313
)
1414

‎go.sum‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,14 @@ github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgf
136136
github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
137137
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
138138
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
139-
github.com/kislerdm/neon-sdk-go v0.13.0 h1:pSwdqARnIAwUoGgeyxTEhGZIb2RtnH8jlOAZVIFRbGI=
140-
github.com/kislerdm/neon-sdk-go v0.13.0/go.mod h1:WSwEZ7oeR5KfQoCuDh/04LZxnSKDcvfsZyfG/QicDb8=
139+
github.com/kislerdm/neon-sdk-go v0.13.1-0.20250425124305-4079c2c3e572 h1:vIT/uXmpNS3e6KRvvu5zTV08PiI2EcV9IH5dLM60IlA=
140+
github.com/kislerdm/neon-sdk-go v0.13.1-0.20250425124305-4079c2c3e572/go.mod h1:WSwEZ7oeR5KfQoCuDh/04LZxnSKDcvfsZyfG/QicDb8=
141+
github.com/kislerdm/neon-sdk-go v0.14.0 h1:eaFJFOPzO51qWDO1us+s1gDjJBrUbG2szv9AvikDbDU=
142+
github.com/kislerdm/neon-sdk-go v0.14.0/go.mod h1:WSwEZ7oeR5KfQoCuDh/04LZxnSKDcvfsZyfG/QicDb8=
143+
github.com/kislerdm/neon-sdk-go v0.14.1 h1:4VkJ6ReSsB1rjxIMA/v/OLL6lEjW/Y3DfBkMDZIkkvY=
144+
github.com/kislerdm/neon-sdk-go v0.14.1/go.mod h1:WSwEZ7oeR5KfQoCuDh/04LZxnSKDcvfsZyfG/QicDb8=
145+
github.com/kislerdm/neon-sdk-go v0.16.0 h1:wRi7QwbViolURHrZKTiPJ6sNDhpiDFH4WWxlNaYJb24=
146+
github.com/kislerdm/neon-sdk-go v0.16.0/go.mod h1:WSwEZ7oeR5KfQoCuDh/04LZxnSKDcvfsZyfG/QicDb8=
141147
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
142148
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
143149
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=

‎provider/helper.go‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,6 @@ import (
99
neon "github.com/kislerdm/neon-sdk-go"
1010
)
1111

12-
func pgSettingsToMap(v neon.PgSettingsData) map[string]interface{} {
13-
o := make(map[string]interface{}, len(v))
14-
for k, v := range v {
15-
o[k] = v
16-
}
17-
return o
18-
}
19-
20-
func mapToPgSettings(v map[string]interface{}) *neon.PgSettingsData {
21-
if len(v) == 0 {
22-
return nil
23-
}
24-
o := make(neon.PgSettingsData, len(v))
25-
for k, v := range v {
26-
o[k] = v
27-
}
28-
return &o
29-
}
30-
3112
func intValidationNotNegative(v interface{}, s string) (warn []string, errs []error) {
3213
if vv, ok := v.(int); ok && vv < 0 {
3314
errs = append(errs, errors.New(s+" must be not negative"))

‎provider/provider.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ var p = &schema.Provider{
4141
"neon_jwks_url": resourceJwksUrl(),
4242
"neon_vpc_endpoint_assignment": resourceVPCEndpointAssignment(),
4343
"neon_vpc_endpoint_restriction": resourceVPCEndpointRestriction(),
44+
"neon_org_api_key": resourceOrgAPIKey(),
4445
},
4546
DataSourcesMap: map[string]*schema.Resource{
4647
"neon_project": dataSourceProject(),

‎provider/resource_endpoint.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func updateStateEndpoint(d *schema.ResourceData, v neon.Endpoint) error {
153153
return err
154154
}
155155
if v.Settings.PgSettings != nil {
156-
if err := d.Set("pg_settings", pgSettingsToMap(*v.Settings.PgSettings)); err != nil {
156+
if err := d.Set("pg_settings", v.Settings.PgSettings); err != nil {
157157
return err
158158
}
159159
}
@@ -206,7 +206,7 @@ func resourceEndpointCreate(ctx context.Context, d *schema.ResourceData, meta in
206206

207207
if v, ok := d.GetOk("pg_settings"); ok {
208208
cfg.Settings = &neon.EndpointSettingsData{
209-
PgSettings: mapToPgSettings(v.(map[string]interface{})),
209+
PgSettings: v.(map[string]interface{}),
210210
}
211211
}
212212

@@ -264,7 +264,7 @@ func resourceEndpointUpdate(ctx context.Context, d *schema.ResourceData, meta in
264264

265265
if v, ok := d.GetOk("pg_settings"); ok {
266266
cfg.Settings = &neon.EndpointSettingsData{
267-
PgSettings: mapToPgSettings(v.(map[string]interface{})),
267+
PgSettings: v.(map[string]interface{}),
268268
}
269269
}
270270

‎provider/resource_jwks_url.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func resourceJwksUrl() *schema.Resource {
6767
}
6868
}
6969

70-
func updateStateJwksUrl(d *schema.ResourceData, v neon.JWKS, roleNames []string) error {
70+
func updateStateJwksUrl(d *schema.ResourceData, v neon.JWKS, roleNames *[]string) error {
7171
if err := d.Set("project_id", v.ProjectID); err != nil {
7272
return err
7373
}
@@ -109,7 +109,7 @@ func resourceJwksUrlCreate(ctx context.Context, d *schema.ResourceData, meta int
109109
for i, roleName := range vv {
110110
roleNames[i] = roleName.(string)
111111
}
112-
cfg.RoleNames = roleNames
112+
cfg.RoleNames = &roleNames
113113
}
114114
if v, ok := d.GetOk("branch_id"); ok && v.(string) != "" {
115115
cfg.BranchID = pointer(v.(string))
@@ -168,7 +168,7 @@ func resourceJwksUrlDelete(ctx context.Context, d *schema.ResourceData, meta int
168168
client := meta.(*neon.Client)
169169
resp, err := client.DeleteProjectJWKS(d.Get("project_id").(string), d.Id())
170170
if err == nil {
171-
err = updateStateJwksUrl(d, resp, []string{})
171+
err = updateStateJwksUrl(d, resp, nil)
172172
}
173173
if err == nil {
174174
d.SetId(resp.ID)

0 commit comments

Comments
 (0)