add json tag to nested objects (#138)

Signed-off-by: Spolti <[email protected]>

Signed-off-by: Spolti <[email protected]>

Author: spolti

hack/go-lint.sh

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-golangci-lint run -E goimports -E errorlint -E gosec "${1}" ./... --timeout 2m0s
+golangci-lint run -E goimports -E errorlint -E gosec ${1} ./... --timeout 2m0s

model/auth.go

@@ -117,7 +117,7 @@ type AuthProperties interface {
 
 // BaseAuthProperties ...
 type BaseAuthProperties struct {
-	Common
+	Common `json:",inline"`
 	// Secret Expression referencing a workflow secret that contains all needed auth info
 	Secret string `json:"secret,omitempty"`
 }
@@ -157,7 +157,7 @@ func (b *BasicAuthProperties) DeepCopyAuthProperties() AuthProperties {
 
 // BasicAuthProperties Basic Auth Info
 type BasicAuthProperties struct {
-	BaseAuthProperties
+	BaseAuthProperties `json:",inline"`
 	// Username String or a workflow expression. Contains the username
 	Username string `json:"username" validate:"required"`
 	// Password String or a workflow expression. Contains the user password
@@ -188,7 +188,7 @@ func (b *BasicAuthProperties) UnmarshalJSON(data []byte) error {
 
 // BearerAuthProperties Bearer auth information
 type BearerAuthProperties struct {
-	BaseAuthProperties
+	BaseAuthProperties `json:",inline"`
 	// Token String or a workflow expression. Contains the token
 	Token string `json:"token" validate:"required"`
 }
@@ -218,7 +218,7 @@ func (b *BearerAuthProperties) UnmarshalJSON(data []byte) error {
 
 // OAuth2AuthProperties OAuth2 information
 type OAuth2AuthProperties struct {
-	BaseAuthProperties
+	BaseAuthProperties `json:",inline"`
 	// Authority String or a workflow expression. Contains the authority information
 	Authority string `json:"authority,omitempty" validate:"omitempty,min=1"`
 	// GrantType Defines the grant type

model/function.go

@@ -42,7 +42,7 @@ type FunctionType string
 
 // Function ...
 type Function struct {
-	Common
+	Common `json:",inline"`
 	// Unique function name
 	Name string `json:"name" validate:"required"`
 	// If type is `rest`, <path_to_openapi_definition>#<operation_id>. If type is `rpc`, <path_to_grpc_proto_file>#<service_name>#<service_method>.

model/object.go

@@ -33,7 +33,7 @@ import (
 //     parsed to int32
 //   - raw		- holds any not typed value, replaces the interface{} behavior.
 type Object struct {
-	IObject
+	IObject `json:",inline"`
 }
 
 // IObject interface that can converted into one of the three subtypes

model/states.go

@@ -14,6 +14,9 @@
 
 package model
 
+// StateType ...
+type StateType string
+
 const (
 	// StateTypeDelay ...
 	StateTypeDelay = "delay"
@@ -59,9 +62,6 @@ func getActionsModelMapping(stateType string) (State, bool) {
 	return nil, false
 }
 
-// StateType ...
-type StateType string
-
 // State definition for a Workflow state
 type State interface {
 	GetID() string

model/workflow.go

@@ -592,7 +592,6 @@ type ProduceEvent struct {
 	// TODO
 	Data string `json:"data,omitempty"`
 	// Add additional event extension context attributes
-	// TODO map[string]interface{}
 	ContextAttributes map[string]string `json:"contextAttributes,omitempty"`
 }