NOISSUE - Sync Env Veriables With Docker Deployment #1841

rodneyosodo · 2023-07-04T08:41:41Z

What does this do?

Add service db env variable to be different from the default env variables. This had already been done for InfluxDB for example for timescale readers and writers the db env variable is envPrefixDB = "MF_TIMESCALE_"
Fixed Cassandra httpserverconfig to be envPrefixHttp as the default and envPrefix as the alternative
Removed SignRSABits and SignHoursValid from certs as they are not used
Remove initialization of things auth cache in mqtt as it is not used
Change things grpc config from MF_THINGS_AUTH_GRPC_ to MF_THINGS_GRPC_
Changed Cassandra config not to start with prefix DB_ for example from DB_CLUSTER to CLUSTER same as Postgres
Added env config for MF_(service)_HTTP_SERVER_CERT and MF_(service)_HTTP_SERVER_KEY as they had not been used

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

No issue

List any changes that modify/break current functionality

Ensure configs are passed on docker-compose file. There is no change to the functionality of the system

Have you included tests for your changes?

No

Did you document any new/modified functionality?

Yes

Notes

N/A

codecov · 2023-07-04T08:57:00Z

Codecov Report

Merging #1841 (610fce2) into master (57d47fe) will decrease coverage by 0.05%.
Report is 1 commits behind head on master.
The diff coverage is 100.00%.

❗ Current head 610fce2 differs from pull request most recent head 9908c67. Consider uploading reports for the commit 9908c67 to get more accurate results

@@            Coverage Diff             @@
##           master    #1841      +/-   ##
==========================================
- Coverage   67.34%   67.30%   -0.05%     
==========================================
  Files         119      118       -1     
  Lines        9411     9358      -53     
==========================================
- Hits         6338     6298      -40     
+ Misses       2402     2392      -10     
+ Partials      671      668       -3

Files Changed	Coverage Δ
pkg/sdk/go/certs.go	`76.19% <ø> (ø)`
pkg/sdk/go/groups.go	`75.60% <ø> (ø)`
pkg/sdk/go/users.go	`76.37% <ø> (ø)`
things/clients/service.go	`73.82% <ø> (ø)`
internal/env/parser.go	`100.00% <100.00%> (+13.55%)`	⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

arvindh123 · 2023-07-19T09:01:14Z

cmd/cassandra-writer/main.go

@@ -106,7 +107,7 @@ func main() {
 	// Create new http server
 	httpServerConfig := server.Config{Port: defSvcHttpPort}

-	if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefix, AltPrefix: envPrefixHttp}); err != nil {
+	if err := env.Parse(&httpServerConfig, env.Options{Prefix: envPrefixHttp, AltPrefix: envPrefix}); err != nil {


@rodneyosodo @dborovcanin We have planned to remove AltPrefix everywhere
Can we remove in this PR

If we have all the prefixes set correctly now, we can remove it in this PR.

arvindh123 · 2023-07-19T09:54:33Z

docker/.env

+MF_COAP_ADAPTER_SERVER_CERT=
+MF_COAP_ADAPTER_SERVER_KEY=


@rodneyosodo , Are these two variables needed ?
because you have added MF_COAP_ADAPTER_HTTP_SERVER_CERT

Yes. They are added already

@rodneyosodo , These two variables not used, Please double check again and remove them

I have implemented it to use TLS if they are provided

Okay, Got it

internal/env/parser.go

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

drasko · 2023-07-28T16:21:30Z

@arvindh123 is this one OK for merge? Please review and test.

arvindh123

LGTM

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

drasko

LGTM

* Initial Commit: Sync Env Veriables With Docker Deployment Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Sync Env Vars With Master Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove Altprefix Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Rename HttpPort to HTTPPort Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix envPrefixDB After Rebase Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove Server Parse Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Add Provision For TLS on CoAP Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Fix Exit After Defer Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Remove Unused Function Signed-off-by: rodneyosodo <blackd0t@protonmail.com> * Document Undocumentated Env Variables Signed-off-by: rodneyosodo <blackd0t@protonmail.com> --------- Signed-off-by: rodneyosodo <blackd0t@protonmail.com> Co-authored-by: Drasko DRASKOVIC <drasko.draskovic@gmail.com>

rodneyosodo requested a review from a team as a code owner July 4, 2023 08:41

rodneyosodo force-pushed the NOISSUE-env branch from 4298794 to dd0e8a1 Compare July 4, 2023 08:43

rodneyosodo force-pushed the NOISSUE-env branch 3 times, most recently from 5a16b72 to 6437219 Compare July 10, 2023 12:26

SammyOina approved these changes Jul 11, 2023

View reviewed changes

rodneyosodo force-pushed the NOISSUE-env branch 3 times, most recently from bc7e028 to 92bafd4 Compare July 12, 2023 08:53

rodneyosodo mentioned this pull request Jul 12, 2023

NOISSUE - Enrich Existing OpenTelemetry Tags #1840

Merged

rodneyosodo force-pushed the NOISSUE-env branch 3 times, most recently from 6fe986b to f48c057 Compare July 13, 2023 07:21

dborovcanin force-pushed the NOISSUE-env branch from f48c057 to 35c8771 Compare July 13, 2023 10:25

rodneyosodo force-pushed the NOISSUE-env branch 3 times, most recently from 424163f to 4845a0c Compare July 13, 2023 15:09

dborovcanin force-pushed the NOISSUE-env branch from 4845a0c to bf8e079 Compare July 18, 2023 19:39

arvindh123 reviewed Jul 19, 2023

View reviewed changes

rodneyosodo force-pushed the NOISSUE-env branch 2 times, most recently from e8e6bdb to bd024de Compare July 24, 2023 19:36

arvindh123 reviewed Jul 26, 2023

View reviewed changes

internal/env/parser.go Outdated Show resolved Hide resolved

arvindh123 reviewed Jul 26, 2023

View reviewed changes

internal/env/parser.go Outdated Show resolved Hide resolved

rodneyosodo force-pushed the NOISSUE-env branch 4 times, most recently from d53bcb6 to 2997cb9 Compare July 28, 2023 13:00

Initial Commit: Sync Env Veriables With Docker Deployment

c112dc4

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

rodneyosodo added 7 commits July 28, 2023 16:53

Sync Env Vars With Master

93dbfc4

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

Remove Altprefix

1af4b7a

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

Rename HttpPort to HTTPPort

59d6fc9

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

Fix envPrefixDB After Rebase

7e586a9

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

Remove Server Parse

57a6292

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

Add Provision For TLS on CoAP

7707a72

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

Fix Exit After Defer

ab16831

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

rodneyosodo force-pushed the NOISSUE-env branch from 2997cb9 to 20d9d07 Compare July 28, 2023 13:53

Remove Unused Function

3596e78

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

rodneyosodo force-pushed the NOISSUE-env branch from 20d9d07 to 3596e78 Compare July 28, 2023 14:09

rodneyosodo mentioned this pull request Jul 28, 2023

NOISSUE - Update OPENAPI Files #1832

Merged

arvindh123 approved these changes Jul 31, 2023

View reviewed changes

rodneyosodo and others added 2 commits July 31, 2023 14:35

Document Undocumentated Env Variables

610fce2

Signed-off-by: rodneyosodo <blackd0t@protonmail.com>

Merge branch 'master' into NOISSUE-env

9908c67

drasko approved these changes Jul 31, 2023

View reviewed changes

drasko merged commit 3e7bac4 into absmach:master Jul 31, 2023
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NOISSUE - Sync Env Veriables With Docker Deployment #1841

NOISSUE - Sync Env Veriables With Docker Deployment #1841

rodneyosodo commented Jul 4, 2023 •

edited by dborovcanin

Loading

codecov bot commented Jul 4, 2023 •

edited

Loading

arvindh123 Jul 19, 2023

dborovcanin Jul 19, 2023

arvindh123 Jul 19, 2023 •

edited

Loading

rodneyosodo Jul 20, 2023

arvindh123 Jul 25, 2023

rodneyosodo Jul 28, 2023

arvindh123 Jul 31, 2023

drasko commented Jul 28, 2023

arvindh123 left a comment

drasko left a comment

		MF_COAP_ADAPTER_SERVER_CERT=
		MF_COAP_ADAPTER_SERVER_KEY=

NOISSUE - Sync Env Veriables With Docker Deployment #1841

NOISSUE - Sync Env Veriables With Docker Deployment #1841

Conversation

rodneyosodo commented Jul 4, 2023 • edited by dborovcanin Loading

What does this do?

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

List any changes that modify/break current functionality

Have you included tests for your changes?

Did you document any new/modified functionality?

Notes

codecov bot commented Jul 4, 2023 • edited Loading

Codecov Report

arvindh123 Jul 19, 2023

Choose a reason for hiding this comment

dborovcanin Jul 19, 2023

Choose a reason for hiding this comment

arvindh123 Jul 19, 2023 • edited Loading

Choose a reason for hiding this comment

rodneyosodo Jul 20, 2023

Choose a reason for hiding this comment

arvindh123 Jul 25, 2023

Choose a reason for hiding this comment

rodneyosodo Jul 28, 2023

Choose a reason for hiding this comment

arvindh123 Jul 31, 2023

Choose a reason for hiding this comment

drasko commented Jul 28, 2023

arvindh123 left a comment

Choose a reason for hiding this comment

drasko left a comment

Choose a reason for hiding this comment

rodneyosodo commented Jul 4, 2023 •

edited by dborovcanin

Loading

codecov bot commented Jul 4, 2023 •

edited

Loading

arvindh123 Jul 19, 2023 •

edited

Loading