Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go.mod: remove pipeline dependencies from go.mod #342

Merged
merged 2 commits into from
Oct 8, 2021
Merged

go.mod: remove pipeline dependencies from go.mod #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
009c3e6
go.mod: remove pipeline dependencies from go.mod
carstendietrich Oct 8, 2021
1f53e72
go.mod: remove pipeline dependencies from go.mod
carstendietrich Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,11 @@ jobs:
fmt=$(gofmt -l .)
test -z $fmt || (echo "please run gofmt" ; echo $fmt ; exit 1)
- name: Go Lint
run: go run golang.org/x/lint/golint -set_exit_status $(go list ./... | grep -v test/integrationtest/projecttest/graphql)
- name: Go Cyclo
run: go run github.com/fzipp/gocyclo/cmd/gocyclo -top 30 -ignore graphql .
run: go run golang.org/x/lint/golint@6edffad -set_exit_status $(go list ./... | grep -v test/integrationtest/projecttest/graphql)
- name: Spelling
run: go run github.com/client9/misspell/cmd/misspell -error .
run: go run github.com/client9/misspell/cmd/misspell@v0.3.4 -error .
- name: In effective assignments
run: go run github.com/gordonklaus/ineffassign .
run: go run github.com/gordonklaus/ineffassign@4cc7213 .
- name: Go Generate
run: |
go generate ./...
Expand Down
2 changes: 1 addition & 1 deletion cart/application/mocks/service.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cart/application/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package application

//go:generate go run github.com/vektra/mockery/v2 --name Service --case snake --structname CartService
//go:generate go run github.com/vektra/mockery/v2@v2.9.4 --name Service --case snake --structname CartService

import (
"context"
Expand Down
12 changes: 6 additions & 6 deletions cart/domain/cart/cartServicePorts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package cart

//go:generate go run github.com/vektra/mockery/v2 --name CompleteBehaviour --case snake
//go:generate go run github.com/vektra/mockery/v2 --name CustomerCartService --case snake
//go:generate go run github.com/vektra/mockery/v2 --name GiftCardAndVoucherBehaviour --case snake
//go:generate go run github.com/vektra/mockery/v2 --name GiftCardBehaviour --case snake
//go:generate go run github.com/vektra/mockery/v2 --name GuestCartService --case snake
//go:generate go run github.com/vektra/mockery/v2 --name ModifyBehaviour --case snake
//go:generate go run github.com/vektra/mockery/v2@v2.9.4 --name CompleteBehaviour --case snake
//go:generate go run github.com/vektra/mockery/v2@v2.9.4 --name CustomerCartService --case snake
//go:generate go run github.com/vektra/mockery/v2@v2.9.4 --name GiftCardAndVoucherBehaviour --case snake
//go:generate go run github.com/vektra/mockery/v2@v2.9.4 --name GiftCardBehaviour --case snake
//go:generate go run github.com/vektra/mockery/v2@v2.9.4 --name GuestCartService --case snake
//go:generate go run github.com/vektra/mockery/v2@v2.9.4 --name ModifyBehaviour --case snake

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion cart/domain/cart/mocks/complete_behaviour.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cart/domain/cart/mocks/customer_cart_service.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cart/domain/cart/mocks/gift_card_and_voucher_behaviour.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cart/domain/cart/mocks/gift_card_behaviour.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cart/domain/cart/mocks/guest_cart_service.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cart/domain/cart/mocks/modify_behaviour.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion commerce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package commerce
*/

//go:generate rm -rf docs/openapi
//go:generate go run github.com/swaggo/swag/cmd/swag init -p pascalcase --generalInfo=commerce.go --dir=./ --output=docs/openapi
//go:generate go run github.com/swaggo/swag/cmd/swag@v1.7.3 init -p pascalcase --generalInfo=commerce.go --dir=./ --output=docs/openapi

// Swagger Documentation used for generator swag (https://github.com/swaggo/swag#declarative-comments-format)
// @title Flamingo Commerce API Spec
Expand Down
4 changes: 2 additions & 2 deletions customer/domain/customer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package domain

//go:generate go run github.com/vektra/mockery/v2 --name Customer --case snake
//go:generate go run github.com/vektra/mockery/v2 --name CustomerIdentityService --case snake
//go:generate go run github.com/vektra/mockery/v2@v2.9.4 --name Customer --case snake
//go:generate go run github.com/vektra/mockery/v2@v2.9.4 --name CustomerIdentityService --case snake

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion customer/domain/mocks/customer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion customer/domain/mocks/customer_identity_service.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 23 additions & 51 deletions docs/openapi/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ var doc = `{
"500": {
"description": "Internal Server Error",
"schema": {
"$ref": "#/definitions/productResultError"
"$ref": "#/definitions/cartResultError"
}
}
}
Expand Down Expand Up @@ -1320,8 +1320,7 @@ var doc = `{
"type": "string"
},
"PaymentSelection": {
"description": "PaymentSelection is used to store information on \"how\" the customer wants to pay",
"$ref": "#/definitions/cart.PaymentSelection"
"description": "PaymentSelection is used to store information on \"how\" the customer wants to pay"
},
"Purchaser": {
"description": "Purchaser hold additional infos for the legal contact person in this order",
Expand Down Expand Up @@ -1501,9 +1500,6 @@ var doc = `{
}
}
},
"cart.PaymentSelection": {
"type": "object"
},
"cart.Person": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -1607,6 +1603,17 @@ var doc = `{
}
}
},
"cartResultError": {
"type": "object",
"properties": {
"Code": {
"type": "string"
},
"Message": {
"type": "string"
}
}
},
"checkoutError": {
"type": "object",
"properties": {
Expand All @@ -1622,11 +1629,9 @@ var doc = `{
"type": "object",
"properties": {
"Error": {
"$ref": "#/definitions/productResultError"
},
"Product": {
"$ref": "#/definitions/domain.BasicProduct"
"$ref": "#/definitions/cartResultError"
},
"Product": {},
"Success": {
"type": "boolean"
}
Expand All @@ -1641,15 +1646,13 @@ var doc = `{
"CartValidationResult": {
"$ref": "#/definitions/validation.Result"
},
"Data": {
"type": "object"
},
"Data": {},
"DataValidationInfo": {
"type": "object"
},
"Error": {
"description": "Contains details if success is false",
"$ref": "#/definitions/productResultError"
"$ref": "#/definitions/cartResultError"
},
"Success": {
"type": "boolean"
Expand Down Expand Up @@ -1685,9 +1688,7 @@ var doc = `{
"State": {
"type": "string"
},
"StateData": {
"$ref": "#/definitions/process.StateData"
},
"StateData": {},
"UUID": {
"type": "string"
}
Expand Down Expand Up @@ -1744,9 +1745,7 @@ var doc = `{
"Item": {
"$ref": "#/definitions/cart.Item"
},
"Product": {
"$ref": "#/definitions/domain.BasicProduct"
}
"Product": {}
}
},
"decorator.DecoratedDelivery": {
Expand All @@ -1769,9 +1768,7 @@ var doc = `{
"Label": {
"type": "string"
},
"RawValue": {
"type": "object"
}
"RawValue": {}
}
},
"domain.Badge": {
Expand All @@ -1785,9 +1782,6 @@ var doc = `{
}
}
},
"domain.BasicProduct": {
"type": "object"
},
"domain.CategoryTeaser": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -1849,8 +1843,7 @@ var doc = `{
"$ref": "#/definitions/domain.FlowActionData"
},
"Data": {
"description": "Data contains additional information related to the action / flow",
"type": "object"
"description": "Data contains additional information related to the action / flow"
},
"Error": {
"description": "Error contains additional information in case of an error (e.g. payment failed)",
Expand Down Expand Up @@ -1914,9 +1907,6 @@ var doc = `{
}
}
},
"domain.Media": {
"type": "object"
},
"domain.PaymentRequestAPI": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2074,9 +2064,7 @@ var doc = `{
},
"Media": {
"type": "array",
"items": {
"$ref": "#/definitions/domain.Media"
}
"items": {}
},
"RetailerCode": {
"type": "string"
Expand Down Expand Up @@ -2133,9 +2121,7 @@ var doc = `{
"Media": {
"description": "Media",
"type": "array",
"items": {
"$ref": "#/definitions/domain.Media"
}
"items": {}
},
"PreSelectedVariantSku": {
"description": "PreSelectedVariantSku might be set for configurables to give a hint to link to a variant of a configurable (That might be the case if a user filters for an attribute and in the teaser the variant with that attribute is shown)",
Expand Down Expand Up @@ -2213,20 +2199,6 @@ var doc = `{
}
}
},
"process.StateData": {
"type": "object"
},
"productResultError": {
"type": "object",
"properties": {
"Code": {
"type": "string"
},
"Message": {
"type": "string"
}
}
},
"validation.ItemValidationError": {
"type": "object",
"properties": {
Expand Down
Loading