Skip to content

Commit 5769b6c

Browse files
committed
fix(Makefile): fix make generate and make docs-generate
This change will fix the make generate and make docs-generate command. make generate was failing with no Go files in /path/to/fidelity/kconnect. Once that issue was resolved there was another issue with hack/tools/bin/conversion-gen using an unknown flag: --input-dirs and unknown flag: --output-file-base. I believe this is because the conversion-gen binary was upgraded, and the newer version of the binary no longer has these flags. Therefore, I have updated the commands to use the new flags. Signed-off-by: Casale, Robert <[email protected]>
1 parent 5c09fdc commit 5769b6c

File tree

4 files changed

+18
-16
lines changed

4 files changed

+18
-16
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@ build-cross: # Build the CLI binary for linux/mac/windows
6868

6969
.PHONY: generate
7070
generate: $(MOCKGEN) $(CONTROLLER_GEN) $(CONVERSION_GEN) # Generate code for the api definitions
71-
go generate
71+
go generate ./...
7272
$(CONTROLLER_GEN) \
7373
paths=./api/... \
7474
object:headerFile=./hack/boilerplate.generatego.txt
7575

7676
$(CONVERSION_GEN) \
77-
--input-dirs=./api/v1alpha1 \
78-
--output-file-base=zz_generated.conversion \
77+
./api/v1alpha1 \
78+
--output-file=zz_generated.conversion \
7979
--go-header-file=./hack/boilerplate.generatego.txt
8080

8181
##@ Release

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/history/loader/mock_loader/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ limitations under the License.
1515
*/
1616

1717
// Run go generate to generate a mock loader
18-
//go:generate ../../../hack/tools/bin/mockgen -destination loader_mock.go -package mock_loader github.com/fidelity/kconnect/pkg/history/loader Loader
18+
//go:generate ../../../../hack/tools/bin/mockgen -destination loader_mock.go -package mock_loader github.com/fidelity/kconnect/pkg/history/loader Loader
1919

2020
package mock_loader //nolint: nolintlint

pkg/history/loader/mock_loader/loader_mock.go

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)