updated go client model template to get enums value right and updated…

… go samples.

modules/swagger-codegen/src/main/resources/go/model.mustache

@@ -11,9 +11,7 @@ type {{{classname}}} {{^format}}{{dataType}}{{/format}}{{#format}}{{{format}}}{{
 const (
 	{{#allowableValues}}
 	{{#enumVars}}
-	{{^-first}}
-	{{/-first}}
-	{{name}}_{{{classname}}} {{{classname}}} = "{{{value}}}"
+	{{name}} {{{classname}}} = {{{value}}}
 	{{/enumVars}}
 	{{/allowableValues}}
 ){{/isEnum}}{{^isEnum}}{{#description}}

samples/client/petstore/go/go-petstore/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.4.16-SNAPSHOT
+2.4.19-SNAPSHOT

samples/client/petstore/go/go-petstore/README.md

@@ -63,6 +63,7 @@ Class | Method | HTTP request | Description
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
+ - [Boolean](docs/Boolean.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
  - [Category](docs/Category.md)
@@ -74,6 +75,7 @@ Class | Method | HTTP request | Description
  - [EnumTest](docs/EnumTest.md)
  - [FormatTest](docs/FormatTest.md)
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
+ - [Ints](docs/Ints.md)
  - [List](docs/List.md)
  - [MapTest](docs/MapTest.md)
  - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
@@ -82,6 +84,7 @@ Class | Method | HTTP request | Description
  - [ModelReturn](docs/ModelReturn.md)
  - [Name](docs/Name.md)
  - [NumberOnly](docs/NumberOnly.md)
+ - [Numbers](docs/Numbers.md)
  - [Order](docs/Order.md)
  - [OuterBoolean](docs/OuterBoolean.md)
  - [OuterComposite](docs/OuterComposite.md)

samples/client/petstore/go/go-petstore/api/swagger.yaml

@@ -107,11 +107,11 @@ paths:
         type: "array"
         items:
           type: "string"
-          default: "available"
           enum:
           - "available"
           - "pending"
           - "sold"
+          default: "available"
         collectionFormat: "csv"
         x-exportParamName: "Status"
       responses:
@@ -639,10 +639,10 @@ paths:
         type: "array"
         items:
           type: "string"
-          default: "$"
           enum:
           - ">"
           - "$"
+          default: "$"
         x-exportParamName: "EnumFormStringArray"
       - name: "enum_form_string"
         in: "formData"
@@ -663,10 +663,10 @@ paths:
         type: "array"
         items:
           type: "string"
-          default: "$"
           enum:
           - ">"
           - "$"
+          default: "$"
         x-exportParamName: "EnumHeaderStringArray"
       - name: "enum_header_string"
         in: "header"
@@ -687,10 +687,10 @@ paths:
         type: "array"
         items:
           type: "string"
-          default: "$"
           enum:
           - ">"
           - "$"
+          default: "$"
         x-exportParamName: "EnumQueryStringArray"
       - name: "enum_query_string"
         in: "query"
@@ -1583,6 +1583,32 @@ definitions:
     type: "string"
   OuterBoolean:
     type: "boolean"
+  Boolean:
+    type: "boolean"
+    description: "True or False indicator"
+    enum:
+    - "true"
+    - "false"
+  Ints:
+    type: "integer"
+    format: "int32"
+    description: "True or False indicator"
+    enum:
+    - "0"
+    - "1"
+    - "2"
+    - "3"
+    - "4"
+    - "5"
+    - "6"
+  Numbers:
+    type: "number"
+    description: "some number"
+    enum:
+    - "7"
+    - "8"
+    - "9"
+    - "10"
 externalDocs:
   description: "Find out more about Swagger"
   url: "http://swagger.io"

samples/client/petstore/go/go-petstore/docs/Boolean.md

@@ -0,0 +1,9 @@
+# Boolean
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/go/go-petstore/docs/Ints.md

@@ -0,0 +1,9 @@
+# Ints
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/go/go-petstore/docs/Numbers.md

@@ -0,0 +1,9 @@
+# Numbers
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/go/go-petstore/model_boolean.go

@@ -0,0 +1,19 @@
+/*
+ * Swagger Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * API version: 1.0.0
+ * Contact: [email protected]
+ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ */
+
+package petstore
+// Boolean : True or False indicator
+type Boolean bool
+
+// List of Boolean
+const (
+	TRUE Boolean = true
+	FALSE Boolean = false
+)

samples/client/petstore/go/go-petstore/model_enum_class.go

@@ -14,7 +14,7 @@ type EnumClass string
 
 // List of EnumClass
 const (
-	ABC_EnumClass EnumClass = "_abc"
-	EFG_EnumClass EnumClass = "-efg"
-	XYZ_EnumClass EnumClass = "(xyz)"
+	ABC EnumClass = "_abc"
+	EFG EnumClass = "-efg"
+	XYZ EnumClass = "(xyz)"
 )

samples/client/petstore/go/go-petstore/model_ints.go

@@ -0,0 +1,24 @@
+/*
+ * Swagger Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * API version: 1.0.0
+ * Contact: [email protected]
+ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ */
+
+package petstore
+// Ints : True or False indicator
+type Ints int32
+
+// List of Ints
+const (
+	_0 Ints = 0
+	_1 Ints = 1
+	_2 Ints = 2
+	_3 Ints = 3
+	_4 Ints = 4
+	_5 Ints = 5
+	_6 Ints = 6
+)

samples/client/petstore/go/go-petstore/model_numbers.go

@@ -0,0 +1,21 @@
+/*
+ * Swagger Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * API version: 1.0.0
+ * Contact: [email protected]
+ * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
+ */
+
+package petstore
+// Numbers : some number
+type Numbers float32
+
+// List of Numbers
+const (
+	_7 Numbers = 7
+	_8 Numbers = 8
+	_9 Numbers = 9
+	_10 Numbers = 10
+)

samples/client/petstore/go/go-petstore/model_outer_enum.go

@@ -14,7 +14,7 @@ type OuterEnum string
 
 // List of OuterEnum
 const (
-	PLACED_OuterEnum OuterEnum = "placed"
-	APPROVED_OuterEnum OuterEnum = "approved"
-	DELIVERED_OuterEnum OuterEnum = "delivered"
+	PLACED OuterEnum = "placed"
+	APPROVED OuterEnum = "approved"
+	DELIVERED OuterEnum = "delivered"
 )

samples/server/petstore/go-api-server/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.4.6-SNAPSHOT
+2.4.19-SNAPSHOT

samples/server/petstore/go-api-server/Dockerfile

@@ -0,0 +1,14 @@
+FROM golang:1.10 AS build
+WORKDIR /go/src
+COPY go ./go
+COPY main.go .
+
+ENV CGO_ENABLED=0
+RUN go get -d -v ./...
+
+RUN go build -a -installsuffix cgo -o swagger .
+
+FROM scratch AS runtime
+COPY --from=build /go/src/swagger ./
+EXPOSE 8080/tcp
+ENTRYPOINT ["./swagger"]