feat(client): move building blocks and their definitions to the GA APIs

.golangci.yml

@@ -165,6 +165,11 @@ linters:
         # field order follows what reads well, not what packs tightest
         - fieldalignment
 
+    recvcheck:
+      # Extends the built-in exclusion of UnmarshalJSON to its json/v2 counterpart.
+      exclusions:
+        - "*.UnmarshalJSONFrom"
+
     staticcheck:
       checks:
         - all
@@ -219,6 +224,14 @@ linters:
     depguard:
       rules:
 
+        # The $ keeps encoding/json/v2 and encoding/json/jsontext out of the match.
+        json:
+          files:
+            - $all
+          deny:
+            - pkg: encoding/json$
+              desc: Use encoding/json/v2 and internal/json instead
+
         # cobra is used in cmd/ and nowhere else.
         cmd:
           files:
@@ -236,14 +249,12 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - log/slog
-            # the deny on encoding/json matches its subpackages too; a listing yields raw items
+            # a listing yields raw items, and reads a field out of one, such as the uuid a run
+            # listing needs per block
             - encoding/json/jsontext
-            # and reads a field out of a raw item, such as the uuid a run listing needs per block
             - encoding/json/v2
             # no direct access to internal/
             - github.com/meshcloud/meshstack-cli/pkg
@@ -261,8 +272,6 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - log/slog
@@ -279,13 +288,10 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - log/slog
-            # the deny on encoding/json matches its subpackages too; a request body is checked as
-            # JSON, and api-docs writes a part of the OpenAPI document
+            # a request body is checked as JSON, and api-docs writes a part of the OpenAPI document
             - encoding/json/jsontext
             - encoding/json/v2
             - github.com/meshcloud/meshstack-cli/cmd/internal
@@ -313,8 +319,6 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - log/slog
@@ -336,8 +340,6 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - log/slog
@@ -358,8 +360,6 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - log/slog
@@ -395,14 +395,11 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - log/slog
-            # the deny on encoding/json matches its subpackages too; a listing writes raw items
+            # a listing writes raw items, and a command that shows one object marshals it
             - encoding/json/jsontext
-            # and a command that shows one object marshals it, or writes it as Markdown
             - encoding/json/v2
             - github.com/meshcloud/meshstack-cli/cmd/internal/markdown
             - github.com/meshcloud/meshstack-cli/cmd/internal/color
@@ -435,8 +432,6 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - encoding/json/v2
@@ -455,8 +450,6 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - log/slog
@@ -471,9 +464,6 @@ linters:
             - "**/internal/json/*.go"
             - "!$test"
           list-mode: strict
-          deny:
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - encoding/json/v2
@@ -501,8 +491,6 @@ linters:
           deny:
             - pkg: log
               desc: Use log/slog instead
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - encoding/json/v2
@@ -518,9 +506,6 @@ linters:
           files:
             - "**/internal/testutil/**/*.go"
           list-mode: strict
-          deny:
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - encoding/json/v2
@@ -556,9 +541,6 @@ linters:
           files:
             - "$test"
           list-mode: strict
-          deny:
-            - pkg: encoding/json
-              desc: Use encoding/json/v2 and internal/json instead
           allow:
             - $gostd
             - encoding/json/v2

client/building_block_definition.go

@@ -151,7 +151,7 @@ type meshBuildingBlockDefinitionClient struct {
 
 func newBuildingBlockDefinitionClient(ctx context.Context, httpClient internal.HttpClient) meshBuildingBlockDefinitionClient {
 	return meshBuildingBlockDefinitionClient{
-		meshObject: internal.NewMeshObjectClient[MeshBuildingBlockDefinition](ctx, httpClient, "v1-preview"),
+		meshObject: internal.NewMeshObjectClient[MeshBuildingBlockDefinition](ctx, httpClient, "v1"),
 	}
 }
 

client/building_block_definition_version.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+	"encoding/json/jsontext"
 	"encoding/json/v2"
 	"errors"
 	"fmt"
@@ -121,8 +122,8 @@ type MeshBuildingBlockDefinitionInput struct {
 	IsEnvironment  bool                                 `json:"isEnvironment" tfsdk:"is_environment"`
 	IsSensitive    bool                                 `json:"isSensitive" tfsdk:"-"`
 	// Argument and DefaultValue hold a [types.Secret] when IsSensitive is true and a [types.Any]
-	// otherwise. [types.Variant] decodes into X first, so UnmarshalJSON moves a non-sensitive value
-	// that also decodes as a Secret over to Y.
+	// otherwise. [types.Variant] decodes into X first, so UnmarshalJSONFrom moves a non-sensitive
+	// value that also decodes as a Secret over to Y.
 	Argument                    types.SecretOrAny `json:"argument" tfsdk:"argument"`
 	DefaultValue                types.SecretOrAny `json:"defaultValue" tfsdk:"default_value"`
 	UpdateableByConsumer        bool              `json:"updateableByConsumer" tfsdk:"updateable_by_consumer"`
@@ -141,10 +142,10 @@ type MeshBuildingBlockDefinitionInput struct {
 	DisplayOrder int64 `json:"displayOrder" tfsdk:"display_order"`
 }
 
-func (m *MeshBuildingBlockDefinitionInput) UnmarshalJSON(bytes []byte) error {
+func (m *MeshBuildingBlockDefinitionInput) UnmarshalJSONFrom(dec *jsontext.Decoder) error {
 	type wrapped MeshBuildingBlockDefinitionInput
 	var target wrapped
-	if err := json.Unmarshal(bytes, &target); err != nil {
+	if err := json.UnmarshalDecode(dec, &target, dec.Options()); err != nil {
 		return err
 	}
 	*m = MeshBuildingBlockDefinitionInput(target)
@@ -223,7 +224,7 @@ type meshBuildingBlockDefinitionVersionClient struct {
 
 func newBuildingBlockDefinitionVersionClient(ctx context.Context, httpClient internal.HttpClient) meshBuildingBlockDefinitionVersionClient {
 	return meshBuildingBlockDefinitionVersionClient{
-		meshObject: internal.NewMeshObjectClient[MeshBuildingBlockDefinitionVersion](ctx, httpClient, "v1-preview"),
+		meshObject: internal.NewMeshObjectClient[MeshBuildingBlockDefinitionVersion](ctx, httpClient, "v1"),
 	}
 }
 

client/building_block_definition_version_implementation.go

@@ -1,6 +1,7 @@
 package client
 
 import (
+	"encoding/json/jsontext"
 	"encoding/json/v2"
 	"fmt"
 
@@ -90,23 +91,23 @@ func (m MeshBuildingBlockDefinitionImplementation) InferType() (enum.Entry[MeshB
 	return result, nil
 }
 
-func (m MeshBuildingBlockDefinitionImplementation) MarshalJSON() ([]byte, error) {
+func (m MeshBuildingBlockDefinitionImplementation) MarshalJSONTo(enc *jsontext.Encoder) error {
 	type wrapped MeshBuildingBlockDefinitionImplementation
 	w := wrapped(m)
 	if len(w.Type) == 0 {
 		inferred, err := m.InferType()
 		if err != nil {
-			return nil, err
+			return err
 		}
 		w.Type = inferred
 	}
-	return json.Marshal(w, wireCompatibility)
+	return json.MarshalEncode(enc, w, enc.Options())
 }
 
-func (m *MeshBuildingBlockDefinitionImplementation) UnmarshalJSON(bytes []byte) error {
+func (m *MeshBuildingBlockDefinitionImplementation) UnmarshalJSONFrom(dec *jsontext.Decoder) error {
 	type wrapped MeshBuildingBlockDefinitionImplementation
 	var target wrapped
-	if err := json.Unmarshal(bytes, &target); err != nil {
+	if err := json.UnmarshalDecode(dec, &target, dec.Options()); err != nil {
 		return err
 	}
 	*m = MeshBuildingBlockDefinitionImplementation(target)

client/building_block_run.go

@@ -15,6 +15,10 @@ type MeshBuildingBlockRun struct {
 	Links    MeshBuildingBlockRunLinks    `json:"_links,omitzero"`
 }
 
+func (run MeshBuildingBlockRun) IsRunning() bool {
+	return run.Status == "PENDING" || run.Status == "IN_PROGRESS"
+}
+
 type MeshBuildingBlockRunMetadata struct {
 	Uuid      string    `json:"uuid"`
 	CreatedAt time.Time `json:"createdAt"`