Merge pull request 'api-v1, generator' (#2 ) from v0.9.x into main

Reviewed-on: #2
switch submodules to main
2023-11-28 15:40:36 +00:00 · 2023-11-28 16:40:13 +01:00 · 2023-11-28 16:10:05 +01:00 · 2023-11-28 16:02:19 +01:00 · 2023-11-28 15:25:08 +01:00 · 2023-11-28 15:23:05 +01:00
16 changed files with 358 additions and 58 deletions
--- a/README.md
+++ b/README.md
@ -41,7 +41,7 @@ from garage_admin_sdk.apis import *
 from garage_admin_sdk.models import *

 configuration = garage_admin_sdk.Configuration(
-  host = "http://localhost:3903/v0",
+  host = "http://localhost:3903/v1",
  access_token = "s3cr3t"
 )

@ -55,13 +55,14 @@ print(f"running garage {status.garage_version}, node_id {status.node}")

 # Change layout of this node
 current = layout.get_layout()
-layout.add_layout({
-  status.node: NodeClusterInfo(
+layout.add_layout([
+  NodeRoleChange(
+    id = status.node,
    zone = "dc1",
-    capacity = 1,
+    capacity = 1000000000,
    tags = [ "dev" ],
  )
-})
+])
 layout.apply_layout(LayoutVersion(
  version = current.version + 1
 ))
@ -108,9 +109,9 @@ npm install --save git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.
 A short example:

 ```javascript
-const garage = require('garage_administration_api_v0garage_v0_8_0');
+const garage = require('garage_administration_api_v1garage_v0_9_0');

-const api = new garage.ApiClient("http://127.0.0.1:3903/v0");
+const api = new garage.ApiClient("http://127.0.0.1:3903/v1");
 api.authentications['bearerAuth'].accessToken = "s3cr3t";

 const [node, layout, key, bucket] = [
@ -139,7 +140,7 @@ Install the SDK with:
 go get git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang
 ```

-A short example:
+An example without error checking:

 ```go
 package main
@ -148,30 +149,84 @@ import (
    "context"
    "fmt"
    "os"
+    "strings"
    garage "git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang"
 )

 func main() {
-    // Set Host and other parameters
+    // Initialization
    configuration := garage.NewConfiguration()
    configuration.Host = "127.0.0.1:3903"
-
-
-    // We can now generate a client
    client := garage.NewAPIClient(configuration)
-
-    // Authentication is handled through the context pattern
    ctx := context.WithValue(context.Background(), garage.ContextAccessToken, "s3cr3t")

-    // Send a request
-    resp, r, err := client.NodesApi.GetNodes(ctx).Execute()
-    if err != nil {
-        fmt.Fprintf(os.Stderr, "Error when calling `NodesApi.GetNodes``: %v\n", err)
-        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+    // Nodes
+    fmt.Println("--- nodes ---")
+    nodes, _, _ := client.NodesApi.GetNodes(ctx).Execute()
+    fmt.Fprintf(os.Stdout, "First hostname: %v\n", nodes.KnownNodes[0].Hostname)
+    capa := int64(1000000000)
+    change := []garage.NodeRoleChange{
+	    garage.NodeRoleChange{NodeRoleUpdate: &garage.NodeRoleUpdate {
+	        Id: *nodes.KnownNodes[0].Id,
+	        Zone: "dc1",
+	        Capacity: *garage.NewNullableInt64(&capa),
+	        Tags: []string{ "fast", "amd64" },
+	    }},
    }
+    staged, _, _ := client.LayoutApi.AddLayout(ctx).NodeRoleChange(change).Execute()
+    msg, _, _ := client.LayoutApi.ApplyLayout(ctx).LayoutVersion(*garage.NewLayoutVersion(staged.Version + 1)).Execute()
+    fmt.Printf(strings.Join(msg.Message, "\n")) // Layout configured

-    // Process the response
-    fmt.Fprintf(os.Stdout, "Target hostname: %v\n", resp.KnownNodes[resp.Node].Hostname)
+    health, _, _ := client.NodesApi.GetHealth(ctx).Execute()
+    fmt.Printf("Status: %s, nodes: %v/%v, storage: %v/%v, partitions: %v/%v\n", health.Status, health.ConnectedNodes, health.KnownNodes, health.StorageNodesOk, health.StorageNodes, health.PartitionsAllOk, health.Partitions)
+
+    // Key
+    fmt.Println("\n--- key ---")
+    key := "openapi-key"
+    keyInfo, _, _ := client.KeyApi.AddKey(ctx).AddKeyRequest(garage.AddKeyRequest{Name: *garage.NewNullableString(&key) }).Execute()
+    defer client.KeyApi.DeleteKey(ctx).Id(*keyInfo.AccessKeyId).Execute()
+    fmt.Printf("AWS_ACCESS_KEY_ID=%s\nAWS_SECRET_ACCESS_KEY=%s\n", *keyInfo.AccessKeyId, *keyInfo.SecretAccessKey.Get())
+
+    id := *keyInfo.AccessKeyId
+    canCreateBucket := true
+    updateKeyRequest := *garage.NewUpdateKeyRequest()
+    updateKeyRequest.SetName("openapi-key-updated")
+    updateKeyRequest.SetAllow(garage.UpdateKeyRequestAllow { CreateBucket: &canCreateBucket })
+    update, _, _ := client.KeyApi.UpdateKey(ctx).Id(id).UpdateKeyRequest(updateKeyRequest).Execute()
+    fmt.Printf("Updated %v with key name %v\n", *update.AccessKeyId, *update.Name)
+
+    keyList, _, _ := client.KeyApi.ListKeys(ctx).Execute()
+    fmt.Printf("Keys count: %v\n", len(keyList))
+
+    // Bucket
+    fmt.Println("\n--- bucket ---")
+    global_name := "global-ns-openapi-bucket"
+    local_name := "local-ns-openapi-bucket"
+    bucketInfo, _, _ := client.BucketApi.CreateBucket(ctx).CreateBucketRequest(garage.CreateBucketRequest{
+        GlobalAlias: &global_name,
+        LocalAlias: &garage.CreateBucketRequestLocalAlias {
+            AccessKeyId: keyInfo.AccessKeyId,
+	    Alias: &local_name,
+        },
+    }).Execute()
+    defer client.BucketApi.DeleteBucket(ctx).Id(*bucketInfo.Id).Execute()
+    fmt.Printf("Bucket id: %s\n", *bucketInfo.Id)
+    
+    updateBucketRequest := *garage.NewUpdateBucketRequest()
+    website := garage.NewUpdateBucketRequestWebsiteAccess()
+    website.SetEnabled(true)
+    website.SetIndexDocument("index.html")
+    website.SetErrorDocument("errors/4xx.html")
+    updateBucketRequest.SetWebsiteAccess(*website)
+    quotas := garage.NewUpdateBucketRequestQuotas()
+    quotas.SetMaxSize(1000000000)
+    quotas.SetMaxObjects(999999999)
+    updateBucketRequest.SetQuotas(*quotas)
+    updatedBucket, _, _ := client.BucketApi.UpdateBucket(ctx).Id(*bucketInfo.Id).UpdateBucketRequest(updateBucketRequest).Execute()
+    fmt.Printf("Bucket %v website activation: %v\n", *updatedBucket.Id, *updatedBucket.WebsiteAccess)
+
+    bucketList, _, _ := client.BucketApi.ListBuckets(ctx).Execute()
+    fmt.Printf("Bucket count: %v\n", len(bucketList))
 }
 ```

--- a/build.gradle
+++ b/build.gradle
@ -3,40 +3,40 @@ plugins {
 }

 task validate(type: org.openapitools.generator.gradle.plugin.tasks.ValidateTask){
-   inputSpec = "./garage/doc/api/garage-admin-v0.yml"
+   inputSpec = "./garage/doc/api/garage-admin-v1.yml"
   recommend = true
 }

 task buildPythonClient(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
    generatorName = "python"
-    inputSpec = "./garage/doc/api/garage-admin-v0.yml"
+    inputSpec = "./garage/doc/api/garage-admin-v1.yml"
    outputDir = "$rootDir/garage-admin-sdk-python"
    gitHost = "git.deuxfleurs.fr"
    gitUserId = "garage-sdk"
    gitRepoId = "garage-admin-sdk-python"
    configOptions = [
        packageName: "garage_admin_sdk",
-        packageVersion: "0.8.0",
+        packageVersion: "0.9.0",
        projectName: "garage-admin-sdk-python"
    ]
 }

 task buildGoClient(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
    generatorName = "go"
-    inputSpec = "./garage/doc/api/garage-admin-v0.yml"
+    inputSpec = "./garage/doc/api/garage-admin-v1.yml"
    outputDir = "$rootDir/garage-admin-sdk-golang"
    gitHost = "git.deuxfleurs.fr"
    gitUserId = "garage-sdk"
    gitRepoId = "garage-admin-sdk-golang"
    configOptions = [
        packageName: "garage",
-        packageVersion: "0.8.0"
+        packageVersion: "0.9.0"
    ]
 }

 task buildJavascriptClient(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
    generatorName = "javascript"
-    inputSpec = "./garage/doc/api/garage-admin-v0.yml"
+    inputSpec = "./garage/doc/api/garage-admin-v1.yml"
    outputDir = "$rootDir/garage-admin-sdk-js"
    gitHost = "git.deuxfleurs.fr"
    gitUserId = "garage-sdk"
@ -46,7 +46,7 @@ task buildJavascriptClient(type: org.openapitools.generator.gradle.plugin.tasks.
        moduleName: "garage",
        npmName: "garage-admin-sdk-js",
        npmRepository: "@dxflrs/garage-admin-sdk-js",
-        packageVersion: "0.8.0",
+        packageVersion: "0.9.0",
        usePromises: "true",
    ]
 }
--- a/example/golang/go.mod
+++ b/example/golang/go.mod
@ -3,7 +3,7 @@ module garage-admin-example
 go 1.18

 require (
-	git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20221113145120-d012cff7c554 // indirect
+	git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231128142223-9dd59cf12c08 // indirect
 	github.com/golang/protobuf v1.4.2 // indirect
 	golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
 	golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558 // indirect
--- a/example/golang/go.sum
+++ b/example/golang/go.sum
@ -33,6 +33,18 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20221113145120-d012cff7c554 h1:GAQabea9CjkmQIDm4MxbG064enYVL69swewbjRfl5G8=
 git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20221113145120-d012cff7c554/go.mod h1:TlSL6QVxozmdRaSgP6Akspi0HCJv4HAkkq3Dldru4GM=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231122201735-f442d10b102d h1:GxlTiFj3WwYjULWp/MvW2iETmDf7TpOtEP2Qst2TkwU=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231122201735-f442d10b102d/go.mod h1:TlSL6QVxozmdRaSgP6Akspi0HCJv4HAkkq3Dldru4GM=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231123075451-d89dcefca5d0 h1:lhvMeTcFi72W1+nBg5LVueuFuNaP+2lIn+1Vg4yZvek=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231123075451-d89dcefca5d0/go.mod h1:TlSL6QVxozmdRaSgP6Akspi0HCJv4HAkkq3Dldru4GM=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231123090411-96f080c89ec4 h1:c7xX/UITgwb+7+m4uOB7BXg/pA+BB7EHhsXNMr8UMNY=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231123090411-96f080c89ec4/go.mod h1:TlSL6QVxozmdRaSgP6Akspi0HCJv4HAkkq3Dldru4GM=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231123092113-ffd9578e975e h1:C/D3P1+mWBTHiO3MeiNWB2S1AJ3A/m7OYGX4iS8nbtA=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231123092113-ffd9578e975e/go.mod h1:TlSL6QVxozmdRaSgP6Akspi0HCJv4HAkkq3Dldru4GM=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231128133246-d1fd35809073 h1:2i4BlF34l5ZuCe9rDQbSnvigGxHMtc99qxP55oUuPt4=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231128133246-d1fd35809073/go.mod h1:TlSL6QVxozmdRaSgP6Akspi0HCJv4HAkkq3Dldru4GM=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231128142223-9dd59cf12c08 h1:pPjSXww/2ebfJ4iHt2NI8/cs/eBV+VC9YLQIW0N3E54=
+git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang v0.0.0-20231128142223-9dd59cf12c08/go.mod h1:TlSL6QVxozmdRaSgP6Akspi0HCJv4HAkkq3Dldru4GM=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
--- a/example/golang/main.go
+++ b/example/golang/main.go
@ -4,6 +4,7 @@ import (
    "context"
    "fmt"
    "os"
+    "strings"
    garage "git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang"
 )

@ -20,12 +21,156 @@ func main() {
    ctx := context.WithValue(context.Background(), garage.ContextAccessToken, "s3cr3t")

    // Send a request
+    fmt.Println("--- nodes ---")
    resp, r, err := client.NodesApi.GetNodes(ctx).Execute()
    if err != nil {
-        fmt.Fprintf(os.Stderr, "Error when calling `NodesApi.GetNodes``: %v\n", err)
+        fmt.Fprintf(os.Stderr, "Error when calling `NodesApi.GetNodes`\n")
        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
    }

    // Process the response
-    fmt.Fprintf(os.Stdout, "Target hostname: %v\n", resp.KnownNodes[resp.Node].Hostname)
+    fmt.Fprintf(os.Stdout, "First hostname: %v\n", resp.KnownNodes[0].Hostname)
+
+    // Layout
+    capa := int64(1000000000)
+    change := []garage.NodeRoleChange{
+	garage.NodeRoleChange{NodeRoleUpdate: &garage.NodeRoleUpdate {
+	    Id: *resp.KnownNodes[0].Id,
+	    Zone: "dc1",
+	    Capacity: *garage.NewNullableInt64(&capa),
+	    Tags: []string{ "fast", "amd64" },
+	}},
+    }
+    staged, r, err := client.LayoutApi.AddLayout(ctx).NodeRoleChange(change).Execute()
+    if err != nil {
+        fmt.Fprintf(os.Stderr, "Error when calling `LayoutApi.AddLayout`\n")
+        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
+    }
+    msg, r, err := client.LayoutApi.ApplyLayout(ctx).LayoutVersion(*garage.NewLayoutVersion(staged.Version + 1)).Execute()
+    if err != nil {
+        fmt.Fprintf(os.Stderr, "Error when calling `LayoutApi.ApplyLayout`\n")
+        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
+    }
+    fmt.Printf(strings.Join(msg.Message, "\n"))
+
+    // Check health
+    health, r, err := client.NodesApi.GetHealth(ctx).Execute()
+    if err != nil {
+        fmt.Fprintf(os.Stderr, "Error when calling `NodesApi.GetHealth`\n")
+        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
+    }
+    fmt.Printf("Status: %s\n", health.Status)
+    fmt.Printf("All nodes: %v/%v healthy\n", health.ConnectedNodes, health.KnownNodes)
+    fmt.Printf("Storage nodes: %v/%v healthy\n", health.StorageNodesOk, health.StorageNodes)
+    fmt.Printf("Partitions: %v/%v healthy\n", health.PartitionsAllOk, health.Partitions)
+
+
+    // Key
+    fmt.Println("\n--- key ---")
+    // -- create
+    key := "openapi-key"
+    keyInfo, r, err := client.KeyApi.AddKey(ctx).AddKeyRequest(garage.AddKeyRequest{Name: *garage.NewNullableString(&key) }).Execute()
+    if err != nil {
+        fmt.Fprintf(os.Stderr, "Error when calling `KeyApi.AddKey`\n")
+        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
+    }
+    fmt.Printf("AWS_ACCESS_KEY_ID=%s\nAWS_SECRET_ACCESS_KEY=%s\n", *keyInfo.AccessKeyId, *keyInfo.SecretAccessKey.Get())
+
+    // -- delete
+    defer func() {
+        r, err := client.KeyApi.DeleteKey(ctx).Id(*keyInfo.AccessKeyId).Execute()
+    	if err != nil {
+            fmt.Fprintf(os.Stderr, "Error when calling `KeyApi.DeleteKey`\n")
+            fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	    panic(err)
+        }
+    }()
+
+    // -- update
+    id := *keyInfo.AccessKeyId
+    canCreateBucket := true
+    updateKeyRequest := *garage.NewUpdateKeyRequest()
+    updateKeyRequest.SetName("openapi-key-updated")
+    updateKeyRequest.SetAllow(garage.UpdateKeyRequestAllow { CreateBucket: &canCreateBucket })
+    update, r, err := client.KeyApi.UpdateKey(ctx).Id(id).UpdateKeyRequest(updateKeyRequest).Execute()
+    if err != nil {
+        fmt.Fprintf(os.Stderr, "Error when calling `KeyApi.UpdateKey`\n")
+        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
+    }
+    fmt.Printf("Updated %v with key name %v\n", *update.AccessKeyId, *update.Name)
+
+    // -- list
+    keyList, r, err := client.KeyApi.ListKeys(ctx).Execute()
+    if err != nil {
+        fmt.Fprintf(os.Stderr, "Error when calling `KeyApi.ListKeys`\n")
+        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
+    }
+    fmt.Printf("Keys count: %v\n", len(keyList))
+
+    // Bucket
+    fmt.Println("\n--- bucket ---")
+    // -- create
+    global_name := "global-ns-openapi-bucket"
+    local_name := "local-ns-openapi-bucket"
+    bucketInfo, r, err := client.BucketApi.CreateBucket(ctx).CreateBucketRequest(garage.CreateBucketRequest{
+        GlobalAlias: &global_name,
+        LocalAlias: &garage.CreateBucketRequestLocalAlias {
+            AccessKeyId: keyInfo.AccessKeyId,
+	    Alias: &local_name,
+        },
+    }).Execute()
+    if err != nil {
+        fmt.Fprintf(os.Stderr, "Error when calling `BucketApi.CreateBucket`\n")
+        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
+    }
+    fmt.Printf("Bucket id: %s\n", *bucketInfo.Id)
+
+    // -- delete
+    defer func() {
+        r, err := client.BucketApi.DeleteBucket(ctx).Id(*bucketInfo.Id).Execute()
+        if err != nil {
+            fmt.Fprintf(os.Stderr, "Error when calling `BucketApi.DeleteBucket`\n")
+            fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	    panic(err)
+        }
+    }()
+
+    // -- update
+    updateBucketRequest := *garage.NewUpdateBucketRequest() 
+
+    website := garage.NewUpdateBucketRequestWebsiteAccess()
+    website.SetEnabled(true)
+    website.SetIndexDocument("index.html")
+    website.SetErrorDocument("errors/4xx.html")
+    updateBucketRequest.SetWebsiteAccess(*website)
+
+    quotas := garage.NewUpdateBucketRequestQuotas()
+    quotas.SetMaxSize(1000000000)
+    quotas.SetMaxObjects(999999999)
+    updateBucketRequest.SetQuotas(*quotas)
+
+    updatedBucket, r, err := client.BucketApi.UpdateBucket(ctx).Id(*bucketInfo.Id).UpdateBucketRequest(updateBucketRequest).Execute()
+    if err != nil {
+        fmt.Fprintf(os.Stderr, "Error when calling `BucketApi.UpdateBucket`\n")
+        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
+    }
+    fmt.Printf("Bucket %v website activation: %v\n", *updatedBucket.Id, *updatedBucket.WebsiteAccess)
+
+    // -- list
+    bucketList, r, err := client.BucketApi.ListBuckets(ctx).Execute()
+    if err != nil {
+        fmt.Fprintf(os.Stderr, "Error when calling `BucketApi.ListBuckets`\n")
+        fmt.Fprintf(os.Stderr, "Full HTTP response: %v\n", r)
+	panic(err)
+    }
+    fmt.Printf("Bucket count: %v\n", len(bucketList))
 }
--- a/example/golang/short.go
+++ b/example/golang/short.go
@ -0,0 +1,85 @@
+package main
+
+import (
+    "context"
+    "fmt"
+    "os"
+    "strings"
+    garage "git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-golang"
+)
+
+func main() {
+    // Initialization
+    configuration := garage.NewConfiguration()
+    configuration.Host = "127.0.0.1:3903"
+    client := garage.NewAPIClient(configuration)
+    ctx := context.WithValue(context.Background(), garage.ContextAccessToken, "s3cr3t")
+
+    // Nodes
+    fmt.Println("--- nodes ---")
+    nodes, _, _ := client.NodesApi.GetNodes(ctx).Execute()
+    fmt.Fprintf(os.Stdout, "First hostname: %v\n", nodes.KnownNodes[0].Hostname)
+    capa := int64(1000000000)
+    change := []garage.NodeRoleChange{
+	    garage.NodeRoleChange{NodeRoleUpdate: &garage.NodeRoleUpdate {
+	        Id: *nodes.KnownNodes[0].Id,
+	        Zone: "dc1",
+	        Capacity: *garage.NewNullableInt64(&capa),
+	        Tags: []string{ "fast", "amd64" },
+	    }},
+    }
+    staged, _, _ := client.LayoutApi.AddLayout(ctx).NodeRoleChange(change).Execute()
+    msg, _, _ := client.LayoutApi.ApplyLayout(ctx).LayoutVersion(*garage.NewLayoutVersion(staged.Version + 1)).Execute()
+    fmt.Printf(strings.Join(msg.Message, "\n")) // Layout configured
+
+    health, _, _ := client.NodesApi.GetHealth(ctx).Execute()
+    fmt.Printf("Status: %s, nodes: %v/%v, storage: %v/%v, partitions: %v/%v\n", health.Status, health.ConnectedNodes, health.KnownNodes, health.StorageNodesOk, health.StorageNodes, health.PartitionsAllOk, health.Partitions)
+
+    // Key
+    fmt.Println("\n--- key ---")
+    key := "openapi-key"
+    keyInfo, _, _ := client.KeyApi.AddKey(ctx).AddKeyRequest(garage.AddKeyRequest{Name: *garage.NewNullableString(&key) }).Execute()
+    defer client.KeyApi.DeleteKey(ctx).Id(*keyInfo.AccessKeyId).Execute()
+    fmt.Printf("AWS_ACCESS_KEY_ID=%s\nAWS_SECRET_ACCESS_KEY=%s\n", *keyInfo.AccessKeyId, *keyInfo.SecretAccessKey.Get())
+
+    id := *keyInfo.AccessKeyId
+    canCreateBucket := true
+    updateKeyRequest := *garage.NewUpdateKeyRequest()
+    updateKeyRequest.SetName("openapi-key-updated")
+    updateKeyRequest.SetAllow(garage.UpdateKeyRequestAllow { CreateBucket: &canCreateBucket })
+    update, _, _ := client.KeyApi.UpdateKey(ctx).Id(id).UpdateKeyRequest(updateKeyRequest).Execute()
+    fmt.Printf("Updated %v with key name %v\n", *update.AccessKeyId, *update.Name)
+
+    keyList, _, _ := client.KeyApi.ListKeys(ctx).Execute()
+    fmt.Printf("Keys count: %v\n", len(keyList))
+
+    // Bucket
+    fmt.Println("\n--- bucket ---")
+    global_name := "global-ns-openapi-bucket"
+    local_name := "local-ns-openapi-bucket"
+    bucketInfo, _, _ := client.BucketApi.CreateBucket(ctx).CreateBucketRequest(garage.CreateBucketRequest{
+        GlobalAlias: &global_name,
+        LocalAlias: &garage.CreateBucketRequestLocalAlias {
+            AccessKeyId: keyInfo.AccessKeyId,
+	    Alias: &local_name,
+        },
+    }).Execute()
+    defer client.BucketApi.DeleteBucket(ctx).Id(*bucketInfo.Id).Execute()
+    fmt.Printf("Bucket id: %s\n", *bucketInfo.Id)
+
+    updateBucketRequest := *garage.NewUpdateBucketRequest()
+    website := garage.NewUpdateBucketRequestWebsiteAccess()
+    website.SetEnabled(true)
+    website.SetIndexDocument("index.html")
+    website.SetErrorDocument("errors/4xx.html")
+    updateBucketRequest.SetWebsiteAccess(*website)
+    quotas := garage.NewUpdateBucketRequestQuotas()
+    quotas.SetMaxSize(1000000000)
+    quotas.SetMaxObjects(999999999)
+    updateBucketRequest.SetQuotas(*quotas)
+    updatedBucket, _, _ := client.BucketApi.UpdateBucket(ctx).Id(*bucketInfo.Id).UpdateBucketRequest(updateBucketRequest).Execute()
+    fmt.Printf("Bucket %v website activation: %v\n", *updatedBucket.Id, *updatedBucket.WebsiteAccess)
+
+    bucketList, _, _ := client.BucketApi.ListBuckets(ctx).Execute()
+    fmt.Printf("Bucket count: %v\n", len(bucketList))
+}
--- a/example/javascript/package-lock.json
+++ b/example/javascript/package-lock.json
@ -9,7 +9,7 @@
      "version": "1.0.0",
      "license": "ISC",
      "dependencies": {
-        "garage_administration_api_v0garage_v0_8_0": "git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git"
+        "garage_administration_api_v1garage_v0_9_0": "git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git#4e3e8ea9986e427f969ab31be116b7ed95ae8362"
      }
    },
    "node_modules/@ampproject/remapping": {
@ -736,9 +736,10 @@
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
    },
-    "node_modules/garage_administration_api_v0garage_v0_8_0": {
-      "version": "v0.8.0",
-      "resolved": "git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git#635d3c1517482099289de1e01c21877b4659208e",
+    "node_modules/garage_administration_api_v1garage_v0_9_0": {
+      "name": "garage_administration_api_v0garage_v0_9_0",
+      "version": "v0.9.0",
+      "resolved": "git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git#4e3e8ea9986e427f969ab31be116b7ed95ae8362",
      "license": "Unlicense",
      "dependencies": {
        "@babel/cli": "^7.0.0",
@ -1813,9 +1814,9 @@
      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
    },
-    "garage_administration_api_v0garage_v0_8_0": {
-      "version": "git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git#635d3c1517482099289de1e01c21877b4659208e",
-      "from": "garage_administration_api_v0garage_v0_8_0@git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git",
+    "garage_administration_api_v1garage_v0_9_0": {
+      "version": "git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git#4e3e8ea9986e427f969ab31be116b7ed95ae8362",
+      "from": "garage_administration_api_v1garage_v0_9_0@git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git#4e3e8ea9986e427f969ab31be116b7ed95ae8362",
      "requires": {
        "@babel/cli": "^7.0.0",
        "superagent": "^5.3.0"
--- a/example/javascript/package.json
+++ b/example/javascript/package.json
@ -9,6 +9,6 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
-    "garage_administration_api_v0garage_v0_8_0": "git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git"
+    "garage_administration_api_v1garage_v0_9_0": "git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-js.git#4e3e8ea9986e427f969ab31be116b7ed95ae8362"
  }
 }
--- a/example/javascript/short.js
+++ b/example/javascript/short.js
@ -1,6 +1,6 @@
-const garage = require('garage_administration_api_v0garage_v0_8_0');
+const garage = require('garage_administration_api_v1garage_v0_9_0');

-const api = new garage.ApiClient("http://127.0.0.1:3903/v0");
+const api = new garage.ApiClient("http://127.0.0.1:3903/v1");
 api.authentications['bearerAuth'].accessToken = "s3cr3t";

 const [node, layout, key, bucket] = [
--- a/example/python/configure_single_node.py
+++ b/example/python/configure_single_node.py
@ -3,7 +3,7 @@ from garage_admin_sdk.apis import *
 from garage_admin_sdk.models import *

 configuration = garage_admin_sdk.Configuration(
-    host = "http://localhost:3903/v0",
+    host = "http://localhost:3903/v1",
    access_token = "s3cr3t"
 )

@ -25,13 +25,14 @@ with garage_admin_sdk.ApiClient(configuration) as api_client:
        exit(1)
    print("it seems to be a fresh node, continuing the configuration")

-    layout.add_layout({
-        status.node: NodeClusterInfo(
+    layout.add_layout([
+        NodeRoleChange(
+            id = status.node,
            zone = "dc1", 
-            capacity = 1,
+            capacity = 1000000000,
            tags = [ "dev" ],
        )
-    })
+    ])
    print("added myself to the layout")

    current = layout.get_layout()
@ -55,7 +56,7 @@ with garage_admin_sdk.ApiClient(configuration) as api_client:

    # --- UPDATE KEY ---
    # not required here, just to demo the API
-    kinfo = keys.search_key("openapi")
+    kinfo = keys.get_key(search="openapi")

    allow_create = UpdateKeyRequestAllow(create_bucket=True)
    kreq = UpdateKeyRequest(allow=allow_create)
@ -63,7 +64,7 @@ with garage_admin_sdk.ApiClient(configuration) as api_client:
    print(f"key {kinfo.access_key_id} can now create buckets")

    # update key info
-    kinfo = keys.search_key("openapi")
+    kinfo = keys.get_key(search="openapi", show_secret_key="true")
    print(f"key permissions: {kinfo.permissions}")

    # ---- THE END ---
--- a/example/python/requirements.txt
+++ b/example/python/requirements.txt
@ -1 +1 @@
-git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-python@f48df53
+git+https://git.deuxfleurs.fr/garage-sdk/garage-admin-sdk-python@e02326f5dbdf467c380663a7ecb14bcdfdc88149
--- a/example/python/short.py
+++ b/example/python/short.py
@ -3,7 +3,7 @@ from garage_admin_sdk.apis import *
 from garage_admin_sdk.models import *

 configuration = garage_admin_sdk.Configuration(
-  host = "http://localhost:3903/v0",
+  host = "http://localhost:3903/v1",
  access_token = "s3cr3t"
 )

@ -17,13 +17,14 @@ print(f"running garage {status.garage_version}, node_id {status.node}")

 # Change layout of this node
 current = layout.get_layout()
-layout.add_layout({
-  status.node: NodeClusterInfo(
+layout.add_layout([
+  NodeRoleChange(
+    id = status.node,
    zone = "dc1",
-    capacity = 1,
+    capacity = 1000000000,
    tags = [ "dev" ],
  )
-})
+])
 layout.apply_layout(LayoutVersion(
  version = current.version + 1
 ))
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 30f1636a00ffc60d1c9ac1d3781ccee21669e54d
+Subproject commit 3908619eac7c46c0d1b065adb4b79db798bc8d22
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit c965fe7f7dc93b9b9a65ec4015c4e7ede0f6121b
+Subproject commit 8b81fae65e5e277b2b9e1659dd657f967a6122a9
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 635d3c1517482099289de1e01c21877b4659208e
+Subproject commit 271b95144902afdcdc7912c61936d955595bf48e
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f48df53ba21b9b544a503801fe0762c70bd1a5ae
+Subproject commit 90e64feb060692c0f19c283cace242e207f03190
Author	SHA1	Message	Date
Quentin	feadb6b8b8	Merge pull request 'api-v1, generator' (#2 ) from v0.9.x into main Reviewed-on: #2	2023-11-28 15:40:36 +00:00
Quentin	6204d1e292	switch submodules to main	2023-11-28 16:40:13 +01:00
Quentin	6a07252d56	Add a short example	2023-11-28 16:10:05 +01:00
Quentin	2c4a602172	improve golang example	2023-11-28 16:02:19 +01:00
Quentin	9bdd615b33	cluster health is working	2023-11-28 15:25:08 +01:00
Quentin	0a681b740c	manually patch the golang sdk	2023-11-28 15:23:05 +01:00
Quentin	53bf952a9e	add cluster health to sdks	2023-11-28 14:33:37 +01:00
Quentin	3fd7d34e50	various fixes	2023-11-23 10:47:43 +01:00
Quentin	eb29f67298	improve golang example	2023-11-23 10:46:14 +01:00
Quentin	5cedde9b9f	golang example layout	2023-11-23 10:29:26 +01:00
Quentin	39ae8b7c75	fix query parameters for key	2023-11-23 08:58:26 +01:00
Quentin	6b641dd607	Upgrade golang + javascript examples	2023-11-22 21:28:55 +01:00
Quentin	1c001906ac	2nd iteration	2023-11-22 21:18:47 +01:00
Quentin	f3cc4f21dc	fix readme python code	2023-11-22 18:51:47 +01:00
Quentin	1428c6d627	partially fix python examples	2023-11-22 18:49:08 +01:00
Quentin	4073edbfcb	api-v1 initial commit	2023-11-22 18:31:40 +01:00