Skip to content

Commit 2b062a6

Browse files
nvnyalenvnyale
committed
moved main.go file under cmd
1 parent 9d58d2e commit 2b062a6

File tree

10 files changed

+76
-24
lines changed

10 files changed

+76
-24
lines changed

‎.buffalo.dev.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
app_root: .
2+
binary_name: rds-api-build
3+
build_delay: 200ns
4+
build_flags: []
5+
build_path: tmp
6+
build_target_path: ./cmd/app
7+
command_env: []
8+
command_flags: []
9+
enable_colors: true
210
ignored_folders:
311
- vendor
412
- log
@@ -13,9 +21,4 @@ ignored_folders:
1321
included_extensions:
1422
- .go
1523
- .env
16-
build_path: tmp
17-
build_delay: 200ns
18-
binary_name: rds-api-build
19-
command_flags: []
20-
enable_colors: true
2124
log_name: buffalo

‎actions/actions_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package actions
22

33
import (
4+
"os"
45
"testing"
56

6-
"github.com/gobuffalo/packr/v2"
77
"github.com/gobuffalo/suite/v3"
88
)
99

@@ -12,7 +12,7 @@ type ActionSuite struct {
1212
}
1313

1414
func Test_ActionSuite(t *testing.T) {
15-
action, err := suite.NewActionWithFixtures(App(), packr.New("../fixtures", "../fixtures"))
15+
action, err := suite.NewActionWithFixtures(App(), os.DirFS("../fixtures"))
1616
if err != nil {
1717
t.Fatal(err)
1818
}

‎main.go ‎cmd/app/main.go

File renamed without changes.

‎config/buffalo-app.toml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name = "rds-api"
2+
bin = "bin/rds-api"
3+
vcs = "git"
4+
with_pop = false
5+
with_sqlite = false
6+
with_dep = false
7+
with_webpack = false
8+
with_nodejs = false
9+
with_yarn = false
10+
with_docker = false
11+
with_grifts = true
12+
as_web = true
13+
as_api = false

‎go.mod

+3-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ go 1.18
44

55
require (
66
github.com/YaleSpinup/apierror v0.1.0
7-
github.com/aws/aws-sdk-go v1.44.71
7+
github.com/aws/aws-sdk-go v1.44.72
88
github.com/gobuffalo/buffalo v0.18.9
99
github.com/gobuffalo/envy v1.10.1
1010
github.com/gobuffalo/mw-paramlogger v1.0.1
11-
github.com/gobuffalo/packr/v2 v2.8.3
1211
github.com/gobuffalo/suite/v3 v3.0.2
1312
github.com/gobuffalo/x v0.1.0
1413
github.com/pkg/errors v0.9.1
@@ -40,6 +39,7 @@ require (
4039
github.com/gobuffalo/mw-csrf v1.0.1 // indirect
4140
github.com/gobuffalo/nulls v0.4.1 // indirect
4241
github.com/gobuffalo/packd v1.0.1 // indirect
42+
github.com/gobuffalo/packr/v2 v2.8.3 // indirect
4343
github.com/gobuffalo/plush/v4 v4.1.14 // indirect
4444
github.com/gobuffalo/pop/v5 v5.3.4 // indirect
4545
github.com/gobuffalo/pop/v6 v6.0.6 // indirect
@@ -68,9 +68,6 @@ require (
6868
github.com/karrick/godirwalk v1.17.0 // indirect
6969
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
7070
github.com/luna-duclos/instrumentedsql v1.1.3 // indirect
71-
github.com/markbates/errx v1.1.0 // indirect
72-
github.com/markbates/oncer v1.0.0 // indirect
73-
github.com/markbates/safe v1.0.1 // indirect
7471
github.com/mattn/go-colorable v0.1.12 // indirect
7572
github.com/mattn/go-isatty v0.0.14 // indirect
7673
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
@@ -86,7 +83,7 @@ require (
8683
github.com/spf13/cobra v1.5.0 // indirect
8784
github.com/spf13/pflag v1.0.5 // indirect
8885
github.com/stretchr/testify v1.8.0 // indirect
89-
golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 // indirect
86+
golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect
9087
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
9188
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect
9289
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect

‎go.sum

+4-11
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi
5151
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
5252
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
5353
github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
54-
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
5554
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
5655
github.com/Masterminds/semver/v3 v3.0.3/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
5756
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
@@ -80,8 +79,8 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
8079
github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
8180
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
8281
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
83-
github.com/aws/aws-sdk-go v1.44.71 h1:e5ZbeFAdDB9i7NcQWdmIiA/NOC4aWec3syOUtUE0dBA=
84-
github.com/aws/aws-sdk-go v1.44.71/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
82+
github.com/aws/aws-sdk-go v1.44.72 h1:i7J5XT7pjBjtl1OrdIhiQHzsG89wkZCcM1HhyK++3DI=
83+
github.com/aws/aws-sdk-go v1.44.72/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
8584
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
8685
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
8786
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
@@ -592,7 +591,6 @@ github.com/gobuffalo/plush v3.7.33+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5s
592591
github.com/gobuffalo/plush v3.7.34+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
593592
github.com/gobuffalo/plush v3.8.0+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
594593
github.com/gobuffalo/plush v3.8.2+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
595-
github.com/gobuffalo/plush v3.8.3+incompatible h1:kzvUTnFPhwyfPEsx7U7LI05/IIslZVGnAlMA1heWub8=
596594
github.com/gobuffalo/plush v3.8.3+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
597595
github.com/gobuffalo/plush/v4 v4.0.0/go.mod h1:ErFS3UxKqEb8fpFJT7lYErfN/Nw6vHGiDMTjxpk5bQ0=
598596
github.com/gobuffalo/plush/v4 v4.1.0/go.mod h1:ErFS3UxKqEb8fpFJT7lYErfN/Nw6vHGiDMTjxpk5bQ0=
@@ -629,7 +627,6 @@ github.com/gobuffalo/pop v4.11.3+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcV
629627
github.com/gobuffalo/pop v4.12.0+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
630628
github.com/gobuffalo/pop v4.12.1+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
631629
github.com/gobuffalo/pop v4.12.2+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
632-
github.com/gobuffalo/pop v4.13.1+incompatible h1:AhbqPxNOBN/DBb2DBaiBqzOXIBQXxEYzngHHJ+ytP4g=
633630
github.com/gobuffalo/pop v4.13.1+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
634631
github.com/gobuffalo/pop/v5 v5.3.2/go.mod h1:Ey1hqzDLkWQKNEfsnafaz+3P1h/TrS++W9PmpGsNxvk=
635632
github.com/gobuffalo/pop/v5 v5.3.4 h1:VWH74icA8khG8SyWDAq6Ch00jcPiC4n436JMFh0lLm0=
@@ -674,7 +671,6 @@ github.com/gobuffalo/tags v2.0.15+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s6
674671
github.com/gobuffalo/tags v2.0.16+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
675672
github.com/gobuffalo/tags v2.1.0+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
676673
github.com/gobuffalo/tags v2.1.5+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
677-
github.com/gobuffalo/tags v2.1.7+incompatible h1:GUxxh34f9SI4U0Pj3ZqvopO9SlzuqSf+g4ZGSPSszt4=
678674
github.com/gobuffalo/tags v2.1.7+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
679675
github.com/gobuffalo/tags/v3 v3.0.2/go.mod h1:ZQeN6TCTiwAFnS0dNcbDtSgZDwNKSpqajvVtt6mlYpA=
680676
github.com/gobuffalo/tags/v3 v3.1.0/go.mod h1:ZQeN6TCTiwAFnS0dNcbDtSgZDwNKSpqajvVtt6mlYpA=
@@ -684,7 +680,6 @@ github.com/gobuffalo/uuid v2.0.3+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw
684680
github.com/gobuffalo/uuid v2.0.4+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE=
685681
github.com/gobuffalo/uuid v2.0.5+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE=
686682
github.com/gobuffalo/validate v2.0.3+incompatible/go.mod h1:N+EtDe0J8252BgfzQUChBgfd6L93m9weay53EWFVsMM=
687-
github.com/gobuffalo/validate v2.0.4+incompatible h1:ZTxozrIw8qQ5nfhShmc4izjYPTsPhfdXTdhXOd5OS9o=
688683
github.com/gobuffalo/validate v2.0.4+incompatible/go.mod h1:N+EtDe0J8252BgfzQUChBgfd6L93m9weay53EWFVsMM=
689684
github.com/gobuffalo/validate/v3 v3.0.0/go.mod h1:HFpjq+AIiA2RHoQnQVTFKF/ZpUPXwyw82LgyDPxQ9r0=
690685
github.com/gobuffalo/validate/v3 v3.1.0/go.mod h1:HFpjq+AIiA2RHoQnQVTFKF/ZpUPXwyw82LgyDPxQ9r0=
@@ -847,7 +842,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
847842
github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
848843
github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
849844
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
850-
github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
851845
github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
852846
github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
853847
github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -876,7 +870,6 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W
876870
github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
877871
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
878872
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
879-
github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
880873
github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
881874
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
882875
github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
@@ -1500,8 +1493,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx
15001493
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
15011494
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
15021495
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
1503-
golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48 h1:N9Vc/rorQUDes6B9CNdIxAn5jODGj2wzfrei2x4wNj4=
1504-
golang.org/x/net v0.0.0-20220805013720-a33c5aa5df48/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
1496+
golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced h1:3dYNDff0VT5xj+mbj2XucFst9WKk6PdGOrb9n+SbIvw=
1497+
golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
15051498
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
15061499
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
15071500
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

‎locales/embed.go

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package locales
2+
3+
import (
4+
"embed"
5+
"io/fs"
6+
7+
"github.com/gobuffalo/buffalo"
8+
)
9+
10+
//go:embed *.yaml
11+
var files embed.FS
12+
13+
func FS() fs.FS {
14+
return buffalo.NewFS(files, "locales")
15+
}

‎public/embed.go

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package public
2+
3+
import (
4+
"embed"
5+
"io/fs"
6+
7+
"github.com/gobuffalo/buffalo"
8+
)
9+
10+
//go:embed *
11+
var files embed.FS
12+
13+
func FS() fs.FS {
14+
return buffalo.NewFS(files, "public")
15+
}

‎templates/embed.go

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package templates
2+
3+
import (
4+
"embed"
5+
"io/fs"
6+
7+
"github.com/gobuffalo/buffalo"
8+
)
9+
10+
//go:embed * */*
11+
var files embed.FS
12+
13+
func FS() fs.FS {
14+
return buffalo.NewFS(files, "templates")
15+
}

‎templates/home/delete_me.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
you can delete this file

0 commit comments

Comments
 (0)