Skip to content

Commit

Permalink
Move Things and Users to Clients
Browse files Browse the repository at this point in the history
Signed-off-by: dusanb94 <dusan.borovcanin@mainflux.com>
  • Loading branch information
rodneyosodo authored and dborovcanin committed May 30, 2023
1 parent 5ac34e2 commit adeff36
Show file tree
Hide file tree
Showing 1,348 changed files with 161,137 additions and 70,741 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@
# https://digitalfortress.tech/tricks/creating-a-global-gitignore/

build

# tools
tools/e2e/e2e
tools/mqtt-bench/mqtt-bench
tools/provision/provision
tools/provision/mfconn.toml
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MF_DOCKER_IMAGE_NAME_PREFIX ?= mainflux
BUILD_DIR = build
SERVICES = users things http coap ws lora influxdb-writer influxdb-reader mongodb-writer \
mongodb-reader cassandra-writer cassandra-reader postgres-writer postgres-reader timescale-writer timescale-reader cli \
bootstrap opcua auth twins mqtt provision certs smtp-notifier smpp-notifier
bootstrap opcua twins mqtt provision certs smtp-notifier smpp-notifier
DOCKERS = $(addprefix docker_,$(SERVICES))
DOCKERS_DEV = $(addprefix docker_dev_,$(SERVICES))
CGO_ENABLED ?= 0
Expand Down Expand Up @@ -78,7 +78,8 @@ test:

proto:
protoc -I. --go_out=. --go_opt=paths=source_relative pkg/messaging/*.proto
protoc -I. --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative *.proto
protoc -I. --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative users/policies/*.proto
protoc -I. --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative things/policies/*.proto

$(SERVICES):
$(call compile_service,$(@))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ For more details, check out the [official documentation][docs].
- Mutual TLS Authentication (mTLS) using X.509 Certificates
- Fine-grained access control (policies, ABAC/RBAC)
- Message persistence (Cassandra, InfluxDB, MongoDB and PostgresSQL)
- Platform logging and instrumentation support (Prometheus and OpenTracing)
- Platform logging and instrumentation support (Prometheus and OpenTelemetry)
- Event sourcing
- Container-based deployment using [Docker][docker] and [Kubernetes][kubernetes]
- [LoRaWAN][lora] network integration
Expand Down
16 changes: 8 additions & 8 deletions api/openapi/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ paths:
description: Missing or invalid access token provided.
'500':
$ref: "#/components/responses/ServiceError"
/things/configs/{configID}:
/things/configs/{configId}:
get:
summary: Retrieves config info (with channels).
tags:
Expand Down Expand Up @@ -108,7 +108,7 @@ paths:
description: Missing or invalid access token provided.
'500':
$ref: "#/components/responses/ServiceError"
/things/configs/certs/{configID}:
/things/configs/certs/{configId}:
patch:
summary: Updates certs
description: |
Expand All @@ -133,7 +133,7 @@ paths:
description: Missing or invalid content type.
'500':
$ref: "#/components/responses/ServiceError"
/things/configs/connections/{configID}:
/things/configs/connections/{configId}:
put:
summary: Updates channels the thing is connected to
description: |
Expand All @@ -158,7 +158,7 @@ paths:
description: Missing or invalid content type.
'500':
$ref: "#/components/responses/ServiceError"
/things/bootstrap/{externalID}:
/things/bootstrap/{externalId}:
get:
summary: Retrieves configuration.
description: |
Expand All @@ -180,7 +180,7 @@ paths:
description: Failed to retrieve corresponding config.
'500':
$ref: "#/components/responses/ServiceError"
/things/bootstrap/secure/{externalID}:
/things/bootstrap/secure/{externalId}:
get:
summary: Retrieves configuration.
description: |
Expand All @@ -199,7 +199,7 @@ paths:
Failed to retrieve corresponding config.
'500':
$ref: "#/components/responses/ServiceError"
/things/state/{configID}:
/things/state/{configId}:
put:
summary: Updates Config state.
description: |
Expand Down Expand Up @@ -338,15 +338,15 @@ components:

parameters:
ConfigId:
name: configID
name: configId
description: Unique Config identifier. It's the ID of the corresponding Thing.
in: path
schema:
type: string
format: uuid
required: true
ExternalId:
name: externalID
name: externalId
description: Unique Config identifier provided by external entity.
in: path
schema:
Expand Down
6 changes: 6 additions & 0 deletions api/openapi/certs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ components:
expire:
type: string
description: Certificate expiry date
Serial:
type: object
properties:
serial:
type: string
description: Certificate serial
CertsPage:
type: object
properties:
Expand Down
6 changes: 3 additions & 3 deletions api/openapi/consumers-notifiers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ paths:
description: Missing or invalid access token provided.
"500":
$ref: "#/components/responses/ServiceError"
/subscriptions/{subID}:
/subscriptions/{id}:
get:
summary: Get subscription with the provided id
description: Retrieves a subscription with the provided id.
Expand Down Expand Up @@ -137,7 +137,7 @@ components:

parameters:
Id:
name: subID
name: id
description: Unique identifier.
in: path
schema:
Expand Down Expand Up @@ -197,7 +197,7 @@ components:
schema:
type: string
description: Created subscription relative URL
example: /subscriptions/{subId}
example: /subscriptions/{id}
View:
description: View subscription.
content:
Expand Down
4 changes: 2 additions & 2 deletions api/openapi/http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ info:
description: HTTP API for sending messages through communication channels.
version: "1.0.0"
paths:
/channels/{chanID}/messages:
/channels/{id}/messages:
post:
summary: Sends message to the communication channel
description: |
Expand Down Expand Up @@ -106,7 +106,7 @@ components:

parameters:
ID:
name: chanID
name: id
description: Unique channel identifier.
in: path
schema:
Expand Down
4 changes: 2 additions & 2 deletions api/openapi/readers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ info:
version: "1.0.0"

paths:
/channels/{chanID}/messages:
/channels/{chanId}/messages:
get:
summary: Retrieves messages sent to single channel
description: |
Expand Down Expand Up @@ -107,7 +107,7 @@ components:

parameters:
ChanId:
name: chanID
name: chanId
description: Unique channel identifier.
in: path
schema:
Expand Down
Loading

0 comments on commit adeff36

Please sign in to comment.