Skip to content

Commit

Permalink
implement domains
Browse files Browse the repository at this point in the history
  • Loading branch information
@ianmuchyri
ianmuchyri committed Nov 30, 2023
1 parent 512485f commit 8521063
Show file tree
Hide file tree
Showing 48 changed files with 3,038 additions and 3,725 deletions.
2 changes: 2 additions & 0 deletions cmd/ui/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ type config struct {
UsersURL string `env:"MG_USERS_URL" envDefault:"http://localhost:9002"`
HostURL string `env:"MG_UI_HOST_URL" envDefault:"http://localhost:9095"`
BootstrapURL string `env:"MG_BOOTSTRAP_URL" envDefault:"http://localhost:9013"`
DomainsURL string `env:"MG_DOMAINS_HTTP_URL" envDefault:"http://localhost:8189"`
MsgContentType sdk.ContentType `env:"MG_CONTENT-TYPE" envDefault:"application/senml+json"`
TLSVerification bool `env:"MG_VERIFICATION_TLS" envDefault:"false"`
}
Expand All @@ -51,6 +52,7 @@ func main() {
MsgContentType: cfg.MsgContentType,
TLSVerification: cfg.TLSVerification,
BootstrapURL: cfg.BootstrapURL,
DomainsURL: cfg.DomainsURL,
}

logger, err := logger.New(os.Stdout, cfg.LogLevel)
Expand Down
1 change: 1 addition & 0 deletions docker/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ MG_HTTP_ADAPTER_URL=http://localhost:8008
MG_READER_URL=http://localhost:9007
MG_THINGS_URL=http://localhost:9000
MG_USERS_URL=http://localhost:9002
MG_DOMAINS_HTTP_URL = http://auth:8189
MG_VERIFICATION_TLS=false
MG_BOOTSTRAP_URL=http://localhost:9013
MG_UI_INSTANCE_ID=
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ services:
MG_THINGS_URL: ${MG_THINGS_URL}
MG_USERS_URL: ${MG_USERS_URL}
MG_BOOTSTRAP_URL: ${MG_BOOTSTRAP_URL}
MG_DOMAINS_HTTP_URL: ${MG_DOMAINS_HTTP_URL}
MG_VERIFICATION_TLS: ${MG_VERIFICATION_TLS}
MG_UI_INSTANCE_ID: ${MG_UI_INSTANCE_ID}
MG_UI_HOST_URL: ${MG_UI_HOST_URL}
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21.0

require (
github.com/absmach/agent v0.0.0-20231107115142-c8b509f24d50
github.com/absmach/magistrala v0.11.1-0.20231102134813-44408395e6a3
github.com/absmach/magistrala v0.11.1-0.20231130085244-39999ad5ee3a
github.com/caarlos0/env/v9 v9.0.0
github.com/eclipse/paho.mqtt.golang v1.4.3
github.com/go-chi/chi/v5 v5.0.10
Expand Down Expand Up @@ -39,7 +39,7 @@ require (
github.com/prometheus/procfs v0.12.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
google.golang.org/protobuf v1.31.0 // indirect
Expand Down
6 changes: 6 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ github.com/absmach/agent v0.0.0-20231107115142-c8b509f24d50 h1:RyDGAkOtIuN34HEJ/
github.com/absmach/agent v0.0.0-20231107115142-c8b509f24d50/go.mod h1:/S3WufAqHTSU6MEq6cN0g6m21RhPX8dxqubYh08vbU8=
github.com/absmach/magistrala v0.11.1-0.20231102134813-44408395e6a3 h1:g5dSaPtjj9mNnz2cMJ076MRKSnrOcMjW8BsJ7Kbzd7s=
github.com/absmach/magistrala v0.11.1-0.20231102134813-44408395e6a3/go.mod h1:ebPpg3UNO6ier1Ic2jBHkd8VUDD62707JRacj4UwGkM=
github.com/absmach/magistrala v0.11.1-0.20231117114648-a5fd7b037aea h1:VPlqBO3Z1sLmPGoypvIjitHH2RYoDuyUouLYAQLJxH4=
github.com/absmach/magistrala v0.11.1-0.20231117114648-a5fd7b037aea/go.mod h1:IOlItdz21DSTjm6+Wd5ADlWwVGyePaps/OLU+Yu/1WI=
github.com/absmach/magistrala v0.11.1-0.20231130085244-39999ad5ee3a h1:wbZ8kzLYK404GNIEuq6mF+WjjU99+PCnGefeHBG5pac=
github.com/absmach/magistrala v0.11.1-0.20231130085244-39999ad5ee3a/go.mod h1:LiF4qov0bRFK7eyD79w0IAABjuGa+Ybix24i9q/aiwI=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Expand Down Expand Up @@ -916,6 +920,8 @@ golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
Expand Down
100 changes: 50 additions & 50 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"prettier": "^3.0.3",
"prettier": "3.1.0",
"prettier-plugin-go-template": "^0.0.15"
}
}
Loading

0 comments on commit 8521063

Please sign in to comment.