Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

tooling: Update to Go 1.16 (#911)

Guilherme Oenninga23d5e44a853
diff --git a/.dockerignore b/.dockerignore
index 897d8165d..dce7d879e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,4 +3,5 @@ tests
data
output
.git
-cover.out
\ No newline at end of file
+cover.out
+scripts
\ No newline at end of file
diff --git a/.github/workflows/fider.yml b/.github/workflows/fider.yml
index a415a94c9..dd44a6084 100644
--- a/.github/workflows/fider.yml
+++ b/.github/workflows/fider.yml
@@ -13,7 +13,7 @@ jobs:
name: test-ui
runs-on: ubuntu-latest
container:
- image: getfider/githubci:0.0.2
+ image: getfider/githubci:0.0.3
steps:
- name: checkout code
@@ -26,7 +26,7 @@ jobs:
name: test-server
runs-on: ubuntu-latest
container:
- image: getfider/githubci:0.0.2
+ image: getfider/githubci:0.0.3
services:
minio:
@@ -63,7 +63,7 @@ jobs:
runs-on: ubuntu-latest
needs: [test-server, test-ui]
container:
- image: getfider/githubci:0.0.2
+ image: getfider/githubci:0.0.3
steps:
- name: checkout code
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0882710da..d272382e1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,9 @@ There are many ways you can contribute to Fider.
## Getting started with Fider codebase
-Before start working on something that you intend to send a Pull Request, make sure there's an [GitHub Issue](https://github.com/getfider/fider/issues) open for that. If you're working on something not tracked yet, please open a new Issue before the Pull Request. If you have any question or need any help, leave a comment on the issue and we'll try our best to help you.
+Before start working on something that you intend to send a Pull Request, make sure there's an [GitHub Issue](https://github.com/getfider/fider/issues) open for that or create one yourself. If it's a new feature you're working on, please share your high level thoughts on the ticket so we can agree on a solution that aligns with the overall architecture and future of Fider.
+
+If you have any question or need help, leave a comment on the issue and we'll do our best to help you out.
Fider is written in Go (backend) and TypeScript (frontend), but we also use things like Node.js, React and PostgreSQL.
If you know these technologies or would like to learn them, lucky you! This is the right place!
@@ -19,7 +21,7 @@ If you know these technologies or would like to learn them, lucky you! This is t
| Software | How to install | What is it used for |
|---|---|---|
-| Go 1.13+ | https://golang.org/ | To compile server side code |
+| Go 1.16+ | https://golang.org/ | To compile server side code |
| Node.js 12+ | https://nodejs.org/ or run `nvm use` if you have nvm installed | To compile TypeScript and bundle all the client side code |
| Docker | https://www.docker.com/ | To start local PostgreSQL instances |
diff --git a/Dockerfile b/Dockerfile
index fd98f9ca9..ff5e94717 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# Build Step
-FROM getfider/githubci:0.0.2 AS builder
+FROM getfider/githubci:0.0.3 AS builder
RUN mkdir /app
WORKDIR /app
diff --git a/air.conf b/air.conf
index 62084504e..34ae32426 100644
--- a/air.conf
+++ b/air.conf
@@ -4,7 +4,7 @@ root = "."
tmp_dir = "tmp"
[build]
-bin = "godotenv -f .env ./fider"
+full_bin = "godotenv -f .env ./fider"
cmd = "go build -o fider ."
log = "server-errors.log"
include_ext = ["go", "tpl", "tmpl", "html", "env"]
diff --git a/app/pkg/jsonq/jsonq.go b/app/pkg/jsonq/jsonq.go
index a4a85270b..8a738f78e 100644
--- a/app/pkg/jsonq/jsonq.go
+++ b/app/pkg/jsonq/jsonq.go
@@ -30,19 +30,22 @@ func New(content string) *Query {
//String returns a string value from the json object based on its selector
func (q *Query) String(selector string) string {
selectors := strings.Split(selector, ",")
+
for _, s := range selectors {
data := q.get(strings.TrimSpace(s))
if data != nil {
- var str json.Number
- err := json.Unmarshal(*data, &str)
- if err != nil {
- return ""
+ var str string
+ if err := json.Unmarshal(*data, &str); err == nil && str != "" {
+ return str
}
- if str != "" {
- return str.String()
+
+ var num int
+ if err := json.Unmarshal(*data, &num); err == nil {
+ return strconv.Itoa(num)
}
}
}
+
return ""
}
diff --git a/etc/README.md b/etc/README.md
deleted file mode 100644
index 0a6b86b27..000000000
--- a/etc/README.md
+++ /dev/null
@@ -1 +0,0 @@
-`development.crt` is a self-generated certificate for testing SSL locally. It SHOULD NOT be used to host any production Fider instance.
\ No newline at end of file
diff --git a/etc/all-dev-fider-io.crt b/etc/all-dev-fider-io.crt
deleted file mode 100644
index 5d097483e..000000000
--- a/etc/all-dev-fider-io.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC/jCCAeagAwIBAgIQPHy+qrjWAli48X78lKnSPDANBgkqhkiG9w0BAQsFADAS
-MRAwDgYDVQQKEwdBY21lIENvMB4XDTE4MTIxOTA3MDIwOFoXDTI4MTIxNjA3MDIw
-OFowEjEQMA4GA1UEChMHQWNtZSBDbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMaY5Tu7pDE5Ae9ZTikVUTdy16wNh6E73coZtyekxIXYfIw3j0rw1Z+S
-hc8mt6RmTYJzCLPQF7wX1hBMlq5KNlYxomfkfT7qaHSSTr6FZuZiH8kiCIG1dF/i
-tMkVP7c+sBfqr3BnXqjMQRX2gidR8DQcX44VvIX9ivQBvbHEZ8UFXbyIp2/Bm0+G
-GXPQHO8EHI74biiAW1FdqNpWFkTvsmy4mVgB3pWH2ZUdIbKyHo2IBQ0it1dmu3kd
-EUU3Wc1GPa5u+0/9cxrmnhnZXGSXKQzcbcACTNmaWPLR0QLFkK4TDfOeiT4OelUr
-VglxPod189LrKbr3ij56dtWXcIqz1BcCAwEAAaNQME4wDgYDVR0PAQH/BAQDAgWg
-MBMGA1UdJQQMMAoGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwGQYDVR0RBBIwEIIO
-Ki5kZXYuZmlkZXIuaW8wDQYJKoZIhvcNAQELBQADggEBAEsj9hvQzeOBqVcfGVYM
-BFck5KWRlzDO/4w113IXVqCyqeIyp3sRmD57Td5KSirZ2Ypj6zx9XrUipGth+sd2
-tp5TqASDoAmaABLlFnKbXM9re4+knbHOZsbvV8fZiJqm3VHHFc33E5zBBkRx9OP0
-YmguZ5+y3jiNNdJp3oyZ6kjHM1ESAqYhY6lE2Lqt40e0ISenJ6ZsushGYwLbvR4U
-gLnGZPOP6JsCUFnX7deNyHLFJdB3BVoY9X788/LwDXmgDeL0uDUT5w4hQD9RWOeb
-Q9A3hpY7t+HP8YJFacDqx0z3MpsshipQ3x+vkIFWndUolfbalvcUQeP5Fh+geLGf
-0+U=
------END CERTIFICATE-----
diff --git a/etc/all-dev-fider-io.key b/etc/all-dev-fider-io.key
deleted file mode 100644
index 87925b15f..000000000
--- a/etc/all-dev-fider-io.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAxpjlO7ukMTkB71lOKRVRN3LXrA2HoTvdyhm3J6TEhdh8jDeP
-SvDVn5KFzya3pGZNgnMIs9AXvBfWEEyWrko2VjGiZ+R9PupodJJOvoVm5mIfySII
-gbV0X+K0yRU/tz6wF+qvcGdeqMxBFfaCJ1HwNBxfjhW8hf2K9AG9scRnxQVdvIin
-b8GbT4YZc9Ac7wQcjvhuKIBbUV2o2lYWRO+ybLiZWAHelYfZlR0hsrIejYgFDSK3
-V2a7eR0RRTdZzUY9rm77T/1zGuaeGdlcZJcpDNxtwAJM2ZpY8tHRAsWQrhMN856J
-Pg56VStWCXE+h3Xz0uspuveKPnp21ZdwirPUFwIDAQABAoIBAQCvrQ6ScWFEHY6l
-oJUwaGgIqbE4xFsm+GMwZOEM04b4c1FxY7CA9VuzJZTycuheKBUGgSXAkiJ8w4Ub
-s/RSxtkcFBn61zcnkYnHHKlFhZJJ16EQdeeafd4s98k+W2qaeXyiG3sH7pjgrpYg
-jIgDqkrWfgbVFEtJJ8hkIqof94Jn189bgBHjgiruXw3fv9S+HxNV7Jeq227l5SFA
-fD/mx7c1XY7tnebzGYbgTFvgAl9zyYqrdWOg0dvAI860dQDTCJVY5YlGKEf/2wut
-VFjsxx6TcKP1YurPK7FLuzLLImfykyr/HGuvqPMUU3OZMNQylYy2cMLm7XRNiOh0
-cpvAlSQhAoGBAPnAsyM2cs86TdXgadisSmi9XiqoUCheOIgLWE2psQDiDHJRmiwi
-xbQUySpt2ks5NEjT9D743xYnXG/groB9dsOs/GHteFkNjDmooktEp3nXIHw3IbrD
-w5ZuT1axhUSKXQGHq0D/xe7/tL8/4/hR515lZkGKkuFs3W/TKmuKVCPxAoGBAMuQ
-nqk+aGleXk4wHEShvNOqdfi76GO674F/6z+j0VgKePr0PlFsWVB5AWbpx0FU96iK
-u7BLiP+5mzl27GcnL/BqHfW3mP6VwQlRzhi8s/+MpDqHTkSvFZUBia/CzKaAR7Gl
-9H9ZKy4WanM+59LtX0jDqVTxpZbNXCiaivDBAuCHAoGBAJ6/zt3uCRIRlFIDQCRa
-dz2WSNnCfJj8MuC+nVVYLEtMY+7yUZYGUDaEE84lX2D7LnGwUAsK8/pH8KioXyML
-HMeKGC5C3IF2bBBmUSqYq/91L4/lF0p4jsT6vvFzCyui6zVCwCcjrPOak5ARE13O
-6csFlvbIF060fRhMWCVdGthxAoGAaR+CD/x+hwuIv+/waTDtBpHc4lqHpBkBXmrk
-3bSHg2PFHjPLitjdNsWGh9LqZz6ttogObPhVA1qiYoabhpmiFBF470+k3rQPP/TS
-7ctlWO8UUHVXYfjYuF5W8EE01jcgzwjYvnsZ5W8GAgXWSgLzVexVIdy4mqvqj71f
-Sv0hszkCgYAmSGhDQLl2EHyRtLZx3U+mvEUR+bfxelae5Mt5CbZ1E8+5Rk1ZYOEL
-4pfM7wt5EP3VarzCv+7xFDTXE2fBZ/jQfqLXpLPolMgWVDLNUIH21J+R8NxAdBi4
-k1Qw/HpGwRaj1z45tMz9YnNEJsP/SbTWjZBKpDCccgfiqQ07t8mmjw==
------END RSA PRIVATE KEY-----
diff --git a/etc/dev-fider-io.crt b/etc/dev-fider-io.crt
new file mode 100644
index 000000000..085a2c9b4
--- /dev/null
+++ b/etc/dev-fider-io.crt
@@ -0,0 +1,56 @@
+-----BEGIN CERTIFICATE-----
+MIIFMDCCBBigAwIBAgISBMs1jTQhfI1dONq6pDWj9JsuMA0GCSqGSIb3DQEBCwUA
+MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
+EwJSMzAeFw0yMTAzMDYwNjU4MDlaFw0yMTA2MDQwNjU4MDlaMBkxFzAVBgNVBAMM
+DiouZGV2LmZpZGVyLmlvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+5glX4KjEjBxV1ameiASP/SCvHf9npgdzC2jGn5ZGa37LDc3+Y/F7cCcYK4fRI9nM
+NxP2M0oTgO2H1JgvJb/HQMBmiS0Ud3Lp8v+KSbsIJS8H5AFS0zSmZFKUKToURCsL
+SOJ9ZDZG+SyPvk7QhiKGTnildTTFHwtLP4T0UFKvIgN9xVECiDN/xerPEghp+UFV
+Yuwr3lNlIZamvnP4JJ0dWCdDAH8bTtG8T04pdZeG500FN1s+aWeidq7jF2g2W7ND
+n0n7kFbo6RsbsFz7iDSAeu7/+mk3Qhkbt81plNfpeKnswS0bqBXZKOP8yUQwOoqN
+szqBXjpGPsTZj8qKwbYkDwIDAQABo4ICVzCCAlMwDgYDVR0PAQH/BAQDAgWgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1Ud
+DgQWBBS8dZmGubxFI5Q+fwADsj++4BY/fDAfBgNVHSMEGDAWgBQULrMXt1hWy65Q
+CUDmH6+dixTCxjBVBggrBgEFBQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9y
+My5vLmxlbmNyLm9yZzAiBggrBgEFBQcwAoYWaHR0cDovL3IzLmkubGVuY3Iub3Jn
+LzAnBgNVHREEIDAegg4qLmRldi5maWRlci5pb4IMZGV2LmZpZGVyLmlvMEwGA1Ud
+IARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0
+dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDw
+AHYA9lyUL9F3MCIUVBgIMJRWjuNNExkzv98MLyALzE7xZOMAAAF4Bos2SQAABAMA
+RzBFAiBSPH+1LwoLSkugd4vpWU9NUS3qOUnaToavXvjyDeYH/AIhAJRYRUku9yJa
+qUNUJQq1rnG2DwAzBgW/vo3t0Lo6JfSVAHYAb1N2rDHwMRnYmQCkURX/dxUcEdkC
+wQApBo2yCJo32RMAAAF4Bos3bQAABAMARzBFAiAmQYLWlaCcKdXwDSaSJsj9OZkj
+/Ip0U1KJaM3A0PvX/gIhAKXix0zWXxONqg2QLtkPdiYq36ass6cO4hVqW2czSQt0
+MA0GCSqGSIb3DQEBCwUAA4IBAQBtU3YuriZSWJAnd8DFAM1+YPq+XUfkqsRH7tcG
+NJS2tAdBTjZWeo8JN3uDPvNrGmjUI14yXHKZd8n4IS8Desw6i/89jENpow+tufdw
+1PmFVuEelrQOtO/YvyoaT+NUxrjXdhwV604ErM+bxWToXdrkoj95x+S4oj2REoC/
+k/TmcFhm3kF9MdLc3t0j+440C3O0nVFiJk7h4gLtloVj/yQw1ifd+1Ill/lXt8ip
+9C3nNEXPNjHUYU3ffD8ipx+6xVjjNLyPxKLOJQLjTdpU/zC+Vk/apPIPTRR5490P
+I+9dwqbptIAps1UltQJHSqhvaUHjxETV0JHJq5m0mzGDlhrA
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
+MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
+AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
+jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
+Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
+U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
+gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
+/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
+oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
+BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
+ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
+p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
+AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
+Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
+LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
+r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
+AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
+ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
+S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
+qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
+O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
+UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/etc/dev-fider-io.key b/etc/dev-fider-io.key
new file mode 100644
index 000000000..8ec04d355
--- /dev/null
+++ b/etc/dev-fider-io.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDmCVfgqMSMHFXV
+qZ6IBI/9IK8d/2emB3MLaMaflkZrfssNzf5j8XtwJxgrh9Ej2cw3E/YzShOA7YfU
+mC8lv8dAwGaJLRR3cuny/4pJuwglLwfkAVLTNKZkUpQpOhREKwtI4n1kNkb5LI++
+TtCGIoZOeKV1NMUfC0s/hPRQUq8iA33FUQKIM3/F6s8SCGn5QVVi7CveU2Uhlqa+
+c/gknR1YJ0MAfxtO0bxPTil1l4bnTQU3Wz5pZ6J2ruMXaDZbs0OfSfuQVujpGxuw
+XPuINIB67v/6aTdCGRu3zWmU1+l4qezBLRuoFdko4/zJRDA6io2zOoFeOkY+xNmP
+yorBtiQPAgMBAAECggEBAMckKYZctCJTWV9pwssfoANTayY99928rzSeVOzM7FOc
+5W4i+WpOID1cKslsf3pYzziTOFz4cN/5QdCimpZEats8dMemVgR+X9e0r2Pa3VdL
+WrphBvG+r5lD/+2c0PSeitti74h0kIaftCTdGBo3Aywlt586ureAUHlBwTtUCTcY
+SEWqOKzHx88NcxBk/HzTRSiOTu75w79qhivRn2DAnN+vGRzb1HDtN6+HENbln0N7
+WOP42ZFxOlkYiLclD6bPbi8IQujUgOAct1Ke/dEOuU661c1myFHLQ7qNbgOdw1Qa
+uaIKz6IN/F0P4BoBLU+MViNp/Svfseyq7vGPQsRMVQECgYEA+oKomLjhT6tSgWJW
+5GmMIoljSFl1gTLeQcoGYr20AFRp78t5uvNiuU5dWBT6EYGm+arTi0kS+6ufuCJ6
+3Vyi1+nn3sbAY3fwu3ATCPn8EbOjEw2dTe+0wvVtr6f/60Xz0m6e3YNfuP4rtzB7
+IxogC42eBTWZiERCs4XDnZN6ToECgYEA6xPT9YaZrBBfpc5N1F9VYvNdcEIIiC40
+r1dq8pT1K/CMnLc1GcPJ+ZxD9m+ygd5LEFbnV648Z2Uu5gL+ISPsiinwx5Zq7h9Y
++Li33ONBSd3aOqIUrlcXT93VodWUbWywPPa3egxNV2DFPBTEF0fDmnI++dVR1DxR
+zntq+WIzSo8CgYBglsJU6GwPYNpWAsnIFh4vLtP2EHArGabyrOebaNOfkOyrxcOw
+3qkBFAMPtD7bQydTepdITCuimADkaX8AHPi40XpSvkVt1NAgJU1hl6mmVaIZ9ZTi
+ePs0dJcPNHKLj5Q8XeSpOj9NP8sxPeMsnKUgb0EvdwQ0s0UYnQnYlwWAgQKBgQCA
+d2KDMB60+HG84+SGpd6857Btk7ij61Rhak2I6jyd2aSOVFTRkrzDC1Hc0Cfmbvvo
+nwVoVlCuVI5vpr0IkWBIFSl/eUVQgpMVwaTBMvRQEMyc9EyHBhM4U0vXWCf4MMiT
+WGTmbuipUroW3mZXLqHHup2N3LUOXjR6udm5FaBgIwKBgQDI5A/nKm/RXg7FDQ4V
+XS8yTno4plLtlXca4/vC6GXKIsZoaCXZYprR9Q9D3TBADhulEbQg0MJSr1UfWnbH
+8QJ3CXti9PeWIrdjuCwhU03B+PK95ZmgYcQF+A+j0FDZkTbw6GXCCnE9oGnlv4km
+NF7u3hTL8xkyYlSOQ+Eb8U48Dw==
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/etc/development.crt b/etc/development.crt
deleted file mode 100644
index 0e1f71d2b..000000000
--- a/etc/development.crt
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICWDCCAd6gAwIBAgIJANjpG+CtupwkMAoGCCqGSM49BAMCMGoxCzAJBgNVBAYT
-AklFMRcwFQYDVQQIDA5TYW50YSBDYXRhcmluYTESMBAGA1UEBwwJSm9pbnZpbGxl
-MQ4wDAYDVQQKDAVGaWRlcjEeMBwGCSqGSIb3DQEJARYPbWVAZ29lbm5pbmcubmV0
-MB4XDTE3MDcwMTE5MjUzNVoXDTI3MDYyOTE5MjUzNVowajELMAkGA1UEBhMCSUUx
-FzAVBgNVBAgMDlNhbnRhIENhdGFyaW5hMRIwEAYDVQQHDAlKb2ludmlsbGUxDjAM
-BgNVBAoMBUZpZGVyMR4wHAYJKoZIhvcNAQkBFg9tZUBnb2VubmluZy5uZXQwdjAQ
-BgcqhkjOPQIBBgUrgQQAIgNiAASNjA4/I5bN6YW3fB1saIdXjzriWSt6V7MquTIv
-i0rI1Wbbi800me0Z8pvZrU4DT8cWNw9FIqUJZsthrLxwCgNKZNmq3REQQhMwtzJo
-FVeJ9vVqJhjQBQhvai85o1/r0BGjUDBOMB0GA1UdDgQWBBTm8JGD741NrUk7gbcQ
-/XqP8Hls1TAfBgNVHSMEGDAWgBTm8JGD741NrUk7gbcQ/XqP8Hls1TAMBgNVHRME
-BTADAQH/MAoGCCqGSM49BAMCA2gAMGUCMCQwZowj8tKkmaKkNTPFGYG2u7fRl+7B
-mqqtwXXwMdY0mFGNjJd7NJOl4uhsQnsgnQIxAPU9GzWzciAb/w4t1Eh8LsISORBr
-XYJ8PQw3nMyctcsd1Eh01M5rUhIpIS/AuE6qQA==
------END CERTIFICATE-----
diff --git a/etc/development.key b/etc/development.key
deleted file mode 100644
index cd9a01b83..000000000
--- a/etc/development.key
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN EC PARAMETERS-----
-BgUrgQQAIg==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDDSmLxu7BOE8zrEUskxC95PRz82meko7uRci3SQ+Ka8BNNXtalTmtYq
-9AC0unK+LE6gBwYFK4EEACKhZANiAASNjA4/I5bN6YW3fB1saIdXjzriWSt6V7Mq
-uTIvi0rI1Wbbi800me0Z8pvZrU4DT8cWNw9FIqUJZsthrLxwCgNKZNmq3REQQhMw
-tzJoFVeJ9vVqJhjQBQhvai85o1/r0BE=
------END EC PRIVATE KEY-----
diff --git a/go.mod b/go.mod
index 8cb2d96bc..e94ae6373 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/getfider/fider
-go 1.13
+go 1.16
require (
github.com/aws/aws-sdk-go v1.25.25
diff --git a/scripts/e2e.sh b/scripts/e2e.sh
index b4e3aa99b..2eb3a9168 100755
--- a/scripts/e2e.sh
+++ b/scripts/e2e.sh
@@ -12,8 +12,8 @@ start_fider () {
docker run \
-d \
-p 3000:3000 \
- -e SSL_CERT=development.crt \
- -e SSL_CERT_KEY=development.key \
+ -e SSL_CERT=dev-fider-io.crt \
+ -e SSL_CERT_KEY=dev-fider-io.key \
-e HOST_MODE=$1 \
-e DATABASE_URL=postgres://fider_e2e:fider_e2e_pw@$PG_CONTAINER:5432/fider_e2e?sslmode=disable \
-v `pwd`/etc:/app/etc \
@@ -30,7 +30,7 @@ run_e2e () {
if [[ $1 == 'build' ]] || [ -z $1 ]
then
- mage build:docker
+ docker build -t getfider/fider .
docker tag getfider/fider getfider/fider:e2e
fi