Feat/change folder structure (#36)

* fix: moved cmd to higher layer * fix: fixing readme --------- Co-authored-by: osher.elmakaies <[email protected]>
AppsFlyer · Feb 9, 2023 · 9d56f95 · 9d56f95
1 parent 887aaa7
commit 9d56f95
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/golang-build-test-coverage.yml b/.github/workflows/golang-build-test-coverage.yml
@@ -34,7 +34,7 @@ jobs:
             dep ensure
         fi
     - name: Build
-      run: go build -v internal/cmd/main.go
+      run: go build -v cmd/main.go
 
   lint:
     name: Lint

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -50,7 +50,7 @@ jobs:
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
           goversion: ${{ steps.get_go_version.outputs.version }}
-          project_path: "internal/cmd/"
+          project_path: "cmd/"
           binary_name: "terra-crust"
           # pre_command: ""
           # build_command: ""

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 
 export GO_VERSION ?= $(shell grep -E "^go " go.mod | awk -F' ' '{print $$2}' )
 export GOLANGCI_LINT_VERSION=v1.50.1
-export MAIN_GO=internal/cmd/main.go
+export MAIN_GO=cmd/main.go
 
 .PHONY: help
 help: ## Show this help message.

diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ terra-crust terraform-all --destination-path="." --source-path=".../modules"
 ## Remote TerraCrust:
 
 ### Description
-From version 2.0.0 TerraCrust will support fetching remote modules 
+From version v0.1.0 TerraCrust will support fetching remote modules 
 and composite them into the root module that is being created.
 ### How to use
 in order to activate this feature all you have to do is to set `fetch-remote` to true like so:  

diff --git a/internal/cmd/app/generate_all.go → cmd/app/generate_all.go b/internal/cmd/app/generate_all.go → cmd/app/generate_all.go
@@ -15,9 +15,9 @@
 package app
 
 import (
+	"github.com/AppsFlyer/terra-crust/cmd/types"
 	"github.com/spf13/cobra"
 
-	"github.com/AppsFlyer/terra-crust/internal/cmd/types"
 	template_reader "github.com/AppsFlyer/terra-crust/internal/services/drivers/template_reader"
 	version_control "github.com/AppsFlyer/terra-crust/internal/services/drivers/version_control"
 )

diff --git a/internal/cmd/app/generate_main.go → cmd/app/generate_main.go b/internal/cmd/app/generate_main.go → cmd/app/generate_main.go
@@ -15,7 +15,7 @@
 package app
 
 import (
-	"github.com/AppsFlyer/terra-crust/internal/cmd/types"
+	"github.com/AppsFlyer/terra-crust/cmd/types"
 	template_reader "github.com/AppsFlyer/terra-crust/internal/services/drivers/template_reader"
 	version_control "github.com/AppsFlyer/terra-crust/internal/services/drivers/version_control"
 	"github.com/spf13/cobra"

diff --git a/internal/cmd/app/generate_terraform_file.go → cmd/app/generate_terraform_file.go b/internal/cmd/app/generate_terraform_file.go → cmd/app/generate_terraform_file.go
@@ -16,8 +16,8 @@ package app
 
 import (
 	"fmt"
+	"github.com/AppsFlyer/terra-crust/cmd/types"
 
-	"github.com/AppsFlyer/terra-crust/internal/cmd/types"
 	"github.com/spf13/cobra"
 )
 

diff --git a/internal/cmd/app/initializer.go → cmd/app/initializer.go b/internal/cmd/app/initializer.go → cmd/app/initializer.go
diff --git a/internal/cmd/app/root.go → cmd/app/root.go b/internal/cmd/app/root.go → cmd/app/root.go
diff --git a/internal/cmd/main.go → cmd/main.go b/internal/cmd/main.go → cmd/main.go
@@ -16,10 +16,10 @@ package main
 
 import (
 	"context"
+	"github.com/AppsFlyer/terra-crust/cmd/app"
 	"os"
 
 	logger "github.com/AppsFlyer/go-logger"
-	"github.com/AppsFlyer/terra-crust/internal/cmd/app"
 )
 
 func main() {

diff --git a/internal/cmd/types/terraform_variable.go → cmd/types/terraform_variable.go b/internal/cmd/types/terraform_variable.go → cmd/types/terraform_variable.go