Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase with Magistrala Repo #1950

Merged
merged 104 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
7066101
Rename Mainflux to Magistrala
dborovcanin Oct 25, 2023
5a565a1
remove deprecated exporter (#13)
SammyOina Oct 27, 2023
0907074
NOISSUE- Fix renaming of mainflux-server to magistrala-server (#15)
ianmuchyri Nov 1, 2023
e17abe7
NOISSUE - Fix sdk (#16)
ianmuchyri Nov 1, 2023
5afad8c
NOISSUE - Bump github.com/docker/docker (#21)
dependabot[bot] Nov 1, 2023
11824a8
NOISSUE - Bump github.com/nats-io/nkeys from 0.4.5 to 0.4.6 (#20)
dependabot[bot] Nov 1, 2023
7922ce8
Fix Cassandra Writer setup (#23)
dborovcanin Nov 1, 2023
28bba6d
Update dependencies (#19)
dborovcanin Nov 1, 2023
254dbcd
NOISSUE - Fix gRPC client naming (#22)
dborovcanin Nov 1, 2023
4440839
NOISSUE - Fix renaming issues (#17)
rodneyosodo Nov 2, 2023
37ed187
NOISSUE - Remove branch from docker project (#27)
SammyOina Nov 9, 2023
dc67f0c
NOISSUE - Fix DOCKER_PROJECT variable assignment (#33)
rodneyosodo Nov 10, 2023
3f37876
NOISSUE - Add Permission to sdk query (#24)
ianmuchyri Nov 10, 2023
ee2b241
NOISSUE - Bump go.opentelemetry.io/contrib/instrumentation/google.gol…
dependabot[bot] Nov 13, 2023
974b143
NOISSUE - Fix branch name in Semaphore (#26)
dborovcanin Nov 13, 2023
4b5f06b
NOISSUE - Update opentelemetry dependencies (#40)
rodneyosodo Nov 14, 2023
41176e8
NOISSUE - Invitation Service Auth Helper (#28)
rodneyosodo Nov 14, 2023
c294e84
NOISSUES - Implement Domains for access control (#14)
arvindh123 Nov 16, 2023
2bccf0c
NOISSUE - Remove internal env package (#32)
rodneyosodo Nov 16, 2023
1c6beb2
MG-53 - Remove precondition check : User exists in Domain only for Su…
arvindh123 Nov 16, 2023
7acf21a
NOISSUE - Export Auth Package (#34)
rodneyosodo Nov 17, 2023
48dddc4
NOISSUE - Add Domains to the SDK (#45)
arvindh123 Nov 17, 2023
a0c40ba
NOISSUE - Update Copyright Notice (#39)
rodneyosodo Nov 17, 2023
a5fd7b0
NOISSUE - Fix error on WS test (#41)
rodneyosodo Nov 17, 2023
7c5ad09
NOISSUE - Fix loading Auth config (#64)
rodneyosodo Nov 20, 2023
0bc8490
NOISSUE - Fix Linting Errors (#65)
rodneyosodo Nov 21, 2023
01c1c5b
NOISSUE - Fix Certs Tests (#51)
rodneyosodo Nov 21, 2023
b67d1d2
NOISSUE - Fix pkg/clients tests (#44)
rodneyosodo Nov 21, 2023
01b312a
NOISSUE - Fix Consumers Tests (#43)
rodneyosodo Nov 21, 2023
23618c1
NOISSUE - Fix Bootstrap Tests (#54)
rodneyosodo Nov 21, 2023
12d4005
NOISSUE - Fix Prefix `magistrala` to Binary Names (#67)
rodneyosodo Nov 21, 2023
2b8aff5
NOISSUE - Bump github.com/go-jose/go-jose/v3 from 3.0.0 to 3.0.1 (#69)
dependabot[bot] Nov 22, 2023
9ae6ca8
NOISSUE - Align WS Documentation (#70)
rodneyosodo Nov 22, 2023
1f9d551
NOISSUE - Fix Users Tests (#42)
rodneyosodo Nov 22, 2023
af4177b
NOISSUE - Fix NATS documentation (#29)
SammyOina Nov 22, 2023
c5b34f0
NOISSUE - Align Users documentation (#71)
rodneyosodo Nov 22, 2023
dd3fb24
NOISSUE - Make Username Unique (#75)
rodneyosodo Nov 23, 2023
705560e
MG-12 - Improve Error Handling (#18)
felixgateru Nov 23, 2023
f6cf7e0
NOISSUE - Fix WS adapter and Nginx configs (#73)
rodneyosodo Nov 23, 2023
ea0559d
NOISSUE - Limit user to have single relation with things, groups, cha…
arvindh123 Nov 27, 2023
98007ad
NOISSUE - Fix SDK page metadata from email to identity. (#77)
ianmuchyri Nov 27, 2023
151eaeb
NOISSUE - Fix SDK Tests (#49)
rodneyosodo Nov 27, 2023
eb019ee
NOISSUE - Fix domains bugs and feature to disable user self register …
arvindh123 Nov 27, 2023
004782d
MG-30 - Auth: Migrate from bone to chi (#47)
felixgateru Nov 27, 2023
5958880
MG-68 - Switch to GitHub Actions (#61)
Musilah Nov 28, 2023
18b0bd9
NOISSUE - Update GitHub templates (#89)
dborovcanin Nov 28, 2023
1e21f55
NOISSUE - Fix policies error handling (#85)
arvindh123 Nov 29, 2023
3362f1a
NOISSUE - Update go.mod and go.sum files (#92)
rodneyosodo Nov 29, 2023
4f1b7ea
NOISSUE - Update env vars for events store (#91)
rodneyosodo Nov 29, 2023
f7350c4
NOISSUE - List user permissions on entities (#66)
arvindh123 Nov 29, 2023
6f195f8
NOISSUE - Fix Update user roles, Listing and retrieve users with role…
arvindh123 Nov 29, 2023
0197244
NOISSUE - Fix Auth tests (#82)
felixgateru Nov 29, 2023
39999ad
NOISSUE - Update self-registration configuration (#95)
rodneyosodo Nov 30, 2023
977bbc5
NOISSUE - Add list permissions to SDK metadata (#96)
ianmuchyri Nov 30, 2023
94c5a36
MG-90 - Fix CI (#93)
Musilah Nov 30, 2023
8ea1042
MG-31 - Make bootstrap tests pass (#97)
felixgateru Dec 1, 2023
29f405b
NOISSUE - Add bootstrap tests to CI (#98)
Musilah Dec 1, 2023
f42c248
MG-31 - Fix HTTP adapter tests (#99)
felixgateru Dec 1, 2023
94cfadc
NOISSUE - Generate Invitation Key (#87)
rodneyosodo Dec 1, 2023
3d1ce7c
MG-31 - Fix Consumers tests (#101)
felixgateru Dec 1, 2023
6edcbee
NOISSUE - Add failfast for CI test run (#100)
Musilah Dec 1, 2023
2dffccf
MG-31 - Fix Readers tests (#102)
felixgateru Dec 1, 2023
3ef67f7
NOISSUE - Enable superadmin listing resources by domains (#105)
arvindh123 Dec 3, 2023
4982174
NOISSUE - Remove `ISSUE_TEMPLATE.md` (#108)
rodneyosodo Dec 4, 2023
0c68108
NOISSUE -Make preshared Key an env var (#109)
rodneyosodo Dec 4, 2023
99b509d
NOISSUE - Update Bootstrap configuration documentation (#111)
rodneyosodo Dec 4, 2023
658fd37
NOISSUE - Update Certs service configuration and docs (#112)
rodneyosodo Dec 4, 2023
e0cd2ce
NOISSUE - Update Readers Documentation (#113)
rodneyosodo Dec 4, 2023
c1e76e6
NOISSUE - Update Auth documentation (#110)
rodneyosodo Dec 4, 2023
93357eb
MG-31 - Fix Things tests (#107)
felixgateru Dec 4, 2023
e7a628e
MG-31 - Fix Twins tests (#106)
felixgateru Dec 4, 2023
44b537c
MG-31 - Fix Users tests (#115)
felixgateru Dec 4, 2023
38b50cb
NOISSUE - Repository Retrieve User By Name (#84)
rodneyosodo Dec 4, 2023
8c05a17
NOISSUE - Align Environment Variables in Docs (#114)
rodneyosodo Dec 4, 2023
ee6b476
NOISSUE - Run Test on Merge to Main (#103)
Musilah Dec 4, 2023
7692546
NOISSUE - Fix WS coverage flag (#121)
Musilah Dec 5, 2023
6f0874c
NOISSUE - Add Linters (#79)
SammyOina Dec 6, 2023
71e6007
MG-132 - Remove Identity From Basic Information (#94)
rodneyosodo Dec 7, 2023
68f551f
NOISSUE - Implement Invitations Service Outline (#116)
rodneyosodo Dec 7, 2023
c8126d1
MG-117 - Update Makefile test target (#122)
Musilah Dec 7, 2023
1f087bf
NOISSUE - Add Invitation service repository layer (#120)
rodneyosodo Dec 7, 2023
75a2e8d
NOISSUE - Add Invitations service layer (#124)
rodneyosodo Dec 8, 2023
c388267
NOISSUE - Add API layer for Invitation service (#125)
rodneyosodo Dec 8, 2023
1fa9fb8
NOISSUE - Update .gitignore (#136)
dborovcanin Dec 8, 2023
5d77ea5
MG-137 - Use Magistrala errors wrap (#138)
rodneyosodo Dec 10, 2023
a078bbe
NOISSUE - Add view Domain permissions (#118)
arvindh123 Dec 11, 2023
0ecf5aa
NOISSUE - Update mTLS support (#134)
rodneyosodo Dec 11, 2023
a07aabe
NOISSUE - Add Invitation service (#126)
rodneyosodo Dec 11, 2023
5aaf1da
NOISSUE - Add order & direction to list Users API (#88)
rodneyosodo Dec 12, 2023
2281b44
MG-140 - Permission denied when checking entity permissions
arvindh123 Dec 12, 2023
4d038c6
MG-31 - Fix pkg tests (#123)
felixgateru Dec 12, 2023
5e541f6
MG-144 - Refactor Invitations to list invitations by state (#148)
rodneyosodo Dec 14, 2023
a8d3e7d
Refactor errors (#155)
felixgateru Dec 14, 2023
aaf0756
NOISSUE - Generate SDK Mocks (#127)
rodneyosodo Dec 15, 2023
13ab8d0
NOISSUE - Add marshalling to retrieve domain response (#154)
ianmuchyri Dec 15, 2023
450a8f9
MG-50 - Auth: Improve gRPC response with error codes (#142)
arvindh123 Dec 15, 2023
6d2096c
NOISSUE - Fix e2e Testing Tool (#135)
rodneyosodo Dec 15, 2023
69791d7
NOISSUE - Update badges (#152)
Musilah Dec 15, 2023
de992d5
NOISSUE - Enforce aliases for errors packages (#147)
rodneyosodo Dec 15, 2023
4bce9b6
NOISSUE - Fix API operations naming (#158)
ianmuchyri Dec 15, 2023
da79c82
NOISSUE - Generate Users repository mocks (#160)
rodneyosodo Dec 15, 2023
3112865
NOISSUE - Generate PubSub mocks (#157)
rodneyosodo Dec 15, 2023
188311e
NOISSUE - Add Docker composition for UI (#153)
ianmuchyri Dec 15, 2023
48e9711
MG-31 - Fix Auth tests (#129)
felixgateru Dec 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) Abstract Machines
# SPDX-License-Identifier: Apache-2.0

.git
.github
build
Expand Down
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @mainflux/maintainers
* @absmach/magistrala
40 changes: 0 additions & 40 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

52 changes: 52 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Copyright (c) Abstract Machines
# SPDX-License-Identifier: Apache-2.0

name: Bug Report
description: File a bug/issue report. Make sure to search to see if an issue already exists for the bug you encountered.
title: "Bug: <title>"
labels: ["bug", "needs-review", "help wanted"]
body:
- type: textarea
attributes:
label: What were you trying to achieve?
description: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
attributes:
label: What are the expected results?
description: A concise description of what you expected to happen.
validations:
required: true
- type: textarea
attributes:
label: What are the received results?
description: A concise description of what you received.
validations:
required: true
- type: textarea
attributes:
label: Steps To Reproduce
description: What are the steps to reproduce the issue?
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: false
- type: textarea
attributes:
label: In what environment did you encounter the issue?
description: A concise description of the environment you encountered the issue in.
validations:
required: true
- type: textarea
attributes:
label: Additional information you deem important
description: |
Links? References? Anything that will give us more context about the issue you are encountering!

Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Copyright (c) Abstract Machines
# SPDX-License-Identifier: Apache-2.0

blank_issues_enabled: false
contact_links:
- name: Google group
url: https://groups.google.com/forum/#!forum/mainflux
about: Join the Mainflux community on Google group.
- name: Gitter
url: https://gitter.im/mainflux/mainflux
about: Join the Mainflux community on Gitter.
39 changes: 39 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Copyright (c) Abstract Machines
# SPDX-License-Identifier: Apache-2.0

name: Feature Request
description: File a feature request. Make sure to search to see if a request already exists for the feature you are requesting.
title: "Feature: <title>"
labels: ["enchancement", "needs-review"]
body:
- type: textarea
attributes:
label: Is your feature request related to a problem? Please describe.
description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
validations:
required: true
- type: textarea
attributes:
label: Describe the feature you are requesting, as well as the possible use case(s) for it.
description: A clear and concise description of what you want to happen.
validations:
required: true
- type: dropdown
attributes:
label: Indicate the importance of this feature to you.
description: This will help us prioritize the feature request.
options:
- Must-have
- Should-have
- Nice-to-have
validations:
required: true
- type: textarea
attributes:
label: Anything else?
description: |
Links? References? Anything that will give us more context about the feature that you are requesting.

Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
validations:
required: false
70 changes: 62 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,69 @@
Pull request title should be `MF-XXX - description` or `NOISSUE - description` where XXX is ID of issue that this PR relate to.
Please review the [CONTRIBUTING.md](https://github.com/mainflux/mainflux/blob/master/CONTRIBUTING.md) file for detailed contributing guidelines.
<!-- Copyright (c) Abstract Machines
SPDX-License-Identifier: Apache-2.0 -->

### What does this do?
<!--

### Which issue(s) does this PR fix/relate to?
Put here `Resolves #XXX` to auto-close the issue that your PR fixes (if such)
Pull request title should be `MG-XXX - description` or `NOISSUE - description` where XXX is ID of the issue that this PR relate to.
Please review the [CONTRIBUTING.md](https://github.com/absmach/magistrala/blob/master/CONTRIBUTING.md) file for detailed contributing guidelines.

### List any changes that modify/break current functionality
For Work In Progress Pull Requests, please use the Draft PR feature, see https://github.blog/2019-02-14-introducing-draft-pull-requests/ for further details.

### Have you included tests for your changes?
For a timely review/response, please avoid force-pushing additional commits if your PR already received reviews or comments.

### Did you document any new/modified functionality?
- Provide tests for your changes.
- Use descriptive commit messages.
- Comment your code where appropriate.
- Squash your commits
- Update any related documentation.
-->

# What type of PR is this?

<!--This represents the type of PR you are submitting.

For example:
This is a bug fix because it fixes the following issue: #1234
This is a feature because it adds the following functionality: ...
This is a refactor because it changes the following functionality: ...
This is a documentation update because it updates the following documentation: ...
This is a dependency update because it updates the following dependencies: ...
This is an optimization because it improves the following functionality: ...
-->

## What does this do?

<!--
Please provide a brief description of what this PR is intended to do.
Include List any changes that modify/break current functionality.
-->

## Which issue(s) does this PR fix/relate to?

<!--
For pull requests that relate or close an issue, please include them below. We like to follow [Github's guidance on linking issues to pull requests](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).

For example having the text: "Resolves #1234" would connect the current pull request to issue 1234. And when we merge the pull request, Github will automatically close the issue.
-->

- Related Issue #
- Resolves #

## Have you included tests for your changes?

<!--If you have not included tests, please explain why.
For example:
Yes, I have included tests for my changes.
No, I have not included tests because I do not know how to.
-->

## Did you document any new/modified feature?

<!--If you have not included documentation, please explain why.
For example:
Yes, I have updated the documentation for the new feature.
No, I have not updated the documentation because I do not know how to.
-->

### Notes

<!--Please provide any additional information you feel is important.-->
63 changes: 63 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Copyright (c) Abstract Machines
# SPDX-License-Identifier: Apache-2.0

name: Continuous Delivery

on:
push:
branches:
- main

jobs:
build-and-push:
name: Build and Push
runs-on: ubuntu-latest
continue-on-error: true

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.21.x
cache-dependency-path: "go.sum"

- name: Run tests
run: |
make test
echo "mode: atomic" > coverage.txt
for f in ./coverage/*.out; do
tail -n +2 "$f" >> coverage.txt
done
go tool cover -html=coverage.txt -o coverage.html

- name: Upload coverage
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV }}
name: codecov-umbrella
verbose: true

- name: Set up Docker Build
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
registry: docker.io
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Compile check for rabbitmq
run: |
MG_MESSAGE_BROKER_TYPE=rabbitmq make mqtt

- name: Compile check for redis
run: |
MG_ES_TYPE=redis make mqtt

- name: Build and push Dockers
run: |
make latest -j $(nproc)
Loading