diff --git a/README.md b/README.md index 0e4d0a9b49a89aad690d87198cee8652290bbb5e..9b286248b6672a696d50681f2c58487bd98dbe81 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Trois comptes de démonstrations permettent de tester le kit avec trois profils Télécharger le dépot ```sh -git clone https://forge.grandlyon.com/apoyen/sdk-go.git +git clone https://forge.grandlyon.com/apoysystemes-dinformation/project-templateen/sdk-go.git ``` Ouvrir le dépôt avec VS Code puis dans l'onglet `Debug`, démarrer le projet avec `Debug SDK-GO with Mock OAuth2` @@ -43,7 +43,7 @@ Installer sur le poste [Docker](https://docs.docker.com/get-docker/) et [docker- Télécharger le dépot ```sh -git clone https://forge.grandlyon.com/apoyen/sdk-go.git +git clone https://forge.grandlyon.com/systemes-dinformation/project-template/sdk-go.git cd sdk-go ``` @@ -122,8 +122,8 @@ Dans le fichier `docker-compose.yml` remplacer `sdk-go-container:` par `<nom-du- Dans le fichier `main.go` remplacer ```go -"forge.grandlyon.com/apoyen/sdk-go/internal/mocks" => "forge.grandlyon.com/apoyen/<nom-du-dépôt>/internal/mocks" -"forge.grandlyon.com/apoyen/sdk-go/internal/rootmux" => "forge.grandlyon.com/apoyen/<nom-du-dépôt/internal/rootmux" +"forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/mocks" => "forge.grandlyon.com/systemes-dinformation/project-template/<nom-du-dépôt>/internal/mocks" +"forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/rootmux" => "forge.grandlyon.com/systemes-dinformation/project-template/<nom-du-dépôt/internal/rootmux" ``` Dans le fichier `dev_certificates/domains.ext` remplacer `DNS.4 = sdk-go.127.0.0.1.nip.io:1443` => `DNS.4 = <hostname-du-projet>.127.0.0.1.nip.io:1443` @@ -131,24 +131,24 @@ Dans le fichier `dev_certificates/domains.ext` remplacer `DNS.4 = sdk-go.127.0.0 Dans le fichier `internal/models/models.go`, remplacer : ```go -"forge.grandlyon.com/apoyen/sdk-go/internal/auth" => "forge.grandlyon.com/apoyen/<nom-du-dépôt>/internal/auth" +"forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" => "forge.grandlyon.com/systemes-dinformation/project-template/<nom-du-dépôt>/internal/auth" ``` Dans le fichier `internal/rootmux/rootmux_test.go` remplacer : ```go -"forge.grandlyon.com/apoyen/sdk-go/internal/auth" => "forge.grandlyon.com/apoyen/<nom-du-dépôt>o/internal/auth" -"forge.grandlyon.com/apoyen/sdk-go/internal/mocks" => "forge.grandlyon.com/apoyen/<nom-du-dépôt>/internal/mocks" +"forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" => "forge.grandlyon.com/systemes-dinformation/project-template/<nom-du-dépôt>o/internal/auth" +"forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/mocks" => "forge.grandlyon.com/systemes-dinformation/project-template/<nom-du-dépôt>/internal/mocks" ``` Dans le fichier `internal/rootmux/rootmux.go`, remplacer : ```go -"forge.grandlyon.com/apoyen/sdk-go/internal/auth" => "forge.grandlyon.com/apoyen/<nom-du-dépôt>/internal/auth" -"forge.grandlyon.com/apoyen/sdk-go/internal/models" => "forge.grandlyon.com/apoyen/<nom-du-dépôt>/internal/models" +"forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" => "forge.grandlyon.com/systemes-dinformation/project-template/<nom-du-dépôt>/internal/auth" +"forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/models" => "forge.grandlyon.com/systemes-dinformation/project-template/<nom-du-dépôt>/internal/models" ``` -Dans le fichier `web/index.html` remplacer `<title>SDK-GO</title>` => `<title><nom-du-projet></title>` et `https://forge.grandlyon.com/apoyen/sdk-go` => `https://forge.grandlyon.com/apoyen/<nom-du-dépot>` +Dans le fichier `web/index.html` remplacer `<title>SDK-GO</title>` => `<title><nom-du-projet></title>` et `https://forge.grandlyon.com/systemes-dinformation/project-template/sdk-go` => `https://forge.grandlyon.com/systemes-dinformation/project-template/<nom-du-dépot>` Dans le fichier `web/assets/brand/brand.js`, remplacer : diff --git a/go.mod b/go.mod index c42318e1596d3203f708d5722f9ce717a4bb6510..1bf59695ac7c20231d50cd66916f2b3825ee2615 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ -module forge.grandlyon.com/apoyen/sdk-go +module forge.grandlyon.com/systemes-dinformation/project-template/sdk-go go 1.14 require ( - github.com/jinzhu/gorm v1.9.12 + github.com/jinzhu/gorm v1.9.15 github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect - github.com/oschwald/maxminddb-golang v1.6.0 - golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 - golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 // indirect + github.com/oschwald/maxminddb-golang v1.7.0 + golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 + golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d - golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect + golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c // indirect ) diff --git a/go.sum b/go.sum index 1e8d7e99d561231708c1d99f3425ae8f229eb3f6..6750c557bb181415af8cc2e1542e830db6866909 100644 --- a/go.sum +++ b/go.sum @@ -1,46 +1,51 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= -github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q= -github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= +github.com/jinzhu/gorm v1.9.15 h1:OdR1qFvtXktlxk73XFYMiYn9ywzTwytqe4QkuMRqc38= +github.com/jinzhu/gorm v1.9.15/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw= -github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/oschwald/maxminddb-golang v1.6.0 h1:KAJSjdHQ8Kv45nFIbtoLGrGWqHFajOIm7skTyz/+Dls= -github.com/oschwald/maxminddb-golang v1.6.0/go.mod h1:DUJFucBg2cvqx42YmDa/+xHvb0elJtOm3o4aFQ/nb/w= +github.com/oschwald/maxminddb-golang v1.7.0 h1:JmU4Q1WBv5Q+2KZy5xJI+98aUwTIrPPxZUkd5Cwr8Zc= +github.com/oschwald/maxminddb-golang v1.7.0/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88= -golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= +golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 h1:WQ8q63x+f/zpC8Ac1s9wLElVoHhm32p6tudrU72n1QA= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= @@ -51,13 +56,13 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 h1:5B6i6EAiSYyejWfvc5Rc9BbI3rzIsrrXfAQBWnYfn+w= -golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c= +golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/auth/auth.go b/internal/auth/auth.go index 5ae0952bcca906a21760a3e809e47297227100e8..11e808147684a102d2a4f2d0cf3b38e291b4d4e0 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" ) type key int diff --git a/internal/auth/auth_test.go b/internal/auth/auth_test.go index 3c6cc34bcd3cfe9d07b63aac965aba69245c9b14..8dc8d9449ab3d030de7bd078892e7b939f6a8c80 100644 --- a/internal/auth/auth_test.go +++ b/internal/auth/auth_test.go @@ -3,7 +3,7 @@ package auth import ( "testing" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" ) var noH = tester.Header{Key: "", Value: ""} diff --git a/internal/auth/inmemory.go b/internal/auth/inmemory.go index 6e84c594e4380a97dc6d8b367514c9c9ca0c81c5..e3c7cfbd9d941e78353f7bcd66a590f7cc266fab 100644 --- a/internal/auth/inmemory.go +++ b/internal/auth/inmemory.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/common" - "forge.grandlyon.com/apoyen/sdk-go/pkg/log" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/common" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/log" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/auth/oauth2.go b/internal/auth/oauth2.go index f7a603847a3ea70724b3627e79b575148ed979cf..e65e357c0dc04b70b0b77433840369ac862bf6c0 100644 --- a/internal/auth/oauth2.go +++ b/internal/auth/oauth2.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/common" - "forge.grandlyon.com/apoyen/sdk-go/pkg/log" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/common" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/log" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" "golang.org/x/oauth2" ) diff --git a/internal/mocks/mocks.go b/internal/mocks/mocks.go index d20b500cd808ace63dad294925586d2f056c4dca..514bd7e2b8bd7327aae3faa213408f548230e621 100644 --- a/internal/mocks/mocks.go +++ b/internal/mocks/mocks.go @@ -7,7 +7,7 @@ import ( "os" "strconv" - "forge.grandlyon.com/apoyen/sdk-go/pkg/middlewares" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/middlewares" ) const literralContentType = "Content-Type" diff --git a/internal/models/bankAccounts.go b/internal/models/bankAccounts.go index 431d223acbb8144b9475045e4f14db494c851058..4ccba66e46b2caf0808bd231bf412342e384735d 100644 --- a/internal/models/bankAccounts.go +++ b/internal/models/bankAccounts.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" ) // HandleBankAccounts handle API call on BankAccounts diff --git a/internal/models/bankers.go b/internal/models/bankers.go index 0a0aaa38de8bac1949c4ff2d7ce91f63b46ede6f..71efa328456cbcbb91825bcd07e31bad6f6c8a23 100644 --- a/internal/models/bankers.go +++ b/internal/models/bankers.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" ) // HandleBankers handle API calls on Bankers diff --git a/internal/models/clients.go b/internal/models/clients.go index 7e009b1e0af668d7ec22374391af9d869ab9aa08..98ac1ff0474c1b5d3bde3979f4976ae4c030c826 100644 --- a/internal/models/clients.go +++ b/internal/models/clients.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" ) // HandleClients expose the UserClients API diff --git a/internal/models/models.go b/internal/models/models.go index 62895b62e1bfa8292edc62715aaccca710bd12e3..3691ee9f7395221612b99fcb85c8106a211c6b54 100644 --- a/internal/models/models.go +++ b/internal/models/models.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" "github.com/jinzhu/gorm" // Needed for sqlite diff --git a/internal/models/operations.go b/internal/models/operations.go index 5374d0fe5858382162ad13e08a89e39c8c03c98b..bab4aa35c24e18334ff44efb5bd5bd84b907dad1 100644 --- a/internal/models/operations.go +++ b/internal/models/operations.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" ) // HandleOperations handle API calls on Operations diff --git a/internal/rootmux/admin_test.go b/internal/rootmux/admin_test.go index 0e0415c4e61966ab0474a577690d156a15b5ae7e..b183a8064d42cf32c87728b36bde5dab9974c23b 100644 --- a/internal/rootmux/admin_test.go +++ b/internal/rootmux/admin_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" ) /** diff --git a/internal/rootmux/banker_test.go b/internal/rootmux/banker_test.go index 005ee7bee34c87809942afe93bdffadf235fb655..00ceee195b64c86237dc529e9ffc822c2400272a 100644 --- a/internal/rootmux/banker_test.go +++ b/internal/rootmux/banker_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" ) /** diff --git a/internal/rootmux/client_test.go b/internal/rootmux/client_test.go index 9a234d7bfc85732a7c30df2edb3c6dc7ae679f01..c28662635e4fd97abc410e380d502e6029821e70 100644 --- a/internal/rootmux/client_test.go +++ b/internal/rootmux/client_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "testing" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" - "forge.grandlyon.com/apoyen/sdk-go/internal/models" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/models" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" ) /** diff --git a/internal/rootmux/rootmux.go b/internal/rootmux/rootmux.go index c36a0d2c067da1005e5d63bf83d35028450b54cb..c0dfb4436d3eb16574592d12e4c7cbf8412297f9 100644 --- a/internal/rootmux/rootmux.go +++ b/internal/rootmux/rootmux.go @@ -4,11 +4,11 @@ import ( "net/http" "os" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" - "forge.grandlyon.com/apoyen/sdk-go/internal/models" - "forge.grandlyon.com/apoyen/sdk-go/pkg/middlewares" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/models" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/middlewares" - "forge.grandlyon.com/apoyen/sdk-go/pkg/common" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/common" ) // RootMux represents the main controller of the application diff --git a/internal/rootmux/rootmux_test.go b/internal/rootmux/rootmux_test.go index 05a217e2ad1c685c67bcc263a20e02510d16d18a..a407fd51d0d054e998abbea15b2c726642a502c3 100644 --- a/internal/rootmux/rootmux_test.go +++ b/internal/rootmux/rootmux_test.go @@ -11,11 +11,11 @@ import ( "regexp" "testing" - "forge.grandlyon.com/apoyen/sdk-go/internal/auth" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tester" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/auth" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tester" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" - "forge.grandlyon.com/apoyen/sdk-go/internal/mocks" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/mocks" ) var ( diff --git a/main.go b/main.go index 253abf9283eba9a46cee2ee13540c1164522b78f..58cbcf8c40efb1243c399bb3d1e430a0ba8bce12 100644 --- a/main.go +++ b/main.go @@ -11,12 +11,12 @@ import ( "syscall" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/middlewares" - "forge.grandlyon.com/apoyen/sdk-go/pkg/tokens" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/middlewares" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/tokens" - "forge.grandlyon.com/apoyen/sdk-go/internal/mocks" - "forge.grandlyon.com/apoyen/sdk-go/internal/rootmux" - "forge.grandlyon.com/apoyen/sdk-go/pkg/log" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/mocks" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/internal/rootmux" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/log" "golang.org/x/crypto/acme/autocert" ) diff --git a/pkg/tokens/tokens.go b/pkg/tokens/tokens.go index 550dff67ae6af91c18c36ff7fb4eeca7491a1398..8cbe31510b7f4d30ada921fc02173259f2ec5d73 100644 --- a/pkg/tokens/tokens.go +++ b/pkg/tokens/tokens.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/common" - "forge.grandlyon.com/apoyen/sdk-go/pkg/log" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/common" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/log" ) var ( diff --git a/pkg/tokens/tokens_test.go b/pkg/tokens/tokens_test.go index dc7b6307adbbcaec9e4321ee8562e6ab524530d1..8eaaf3125b7f7d59668d61f1ba78245091e3695a 100644 --- a/pkg/tokens/tokens_test.go +++ b/pkg/tokens/tokens_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "forge.grandlyon.com/apoyen/sdk-go/pkg/common" + "forge.grandlyon.com/systemes-dinformation/project-template/sdk-go/pkg/common" ) type user struct { diff --git a/web/index.html b/web/index.html index f8494dc3695f8806dd165177831402ecf051dfce..8aeeac49bb8db87567ca3badd89b47d7812518de 100644 --- a/web/index.html +++ b/web/index.html @@ -28,7 +28,7 @@ <div class="navbar-brand"> <div class="navbar-item"> <div class="buttons"> - <a class="button is-danger" href="https://forge.grandlyon.com/apoyen/sdk-go" target="_blank" rel="noopener noreferrer"> + <a class="button is-danger" href="https://forge.grandlyon.com/systemes-dinformation/project-template/sdk-go" target="_blank" rel="noopener noreferrer"> <span class="icon"> <svg class="svg-inline--fa fa-gitlab fa-w-16"