Skip to content

Commit 934e86c

Browse files
ItalyPaleAleItalyPaleAle
authored
Rename folder "internal" to "common" (dapr#3225)
 Signed-off-by: ItalyPaleAle <[email protected]>
1 parent 95690ac commit 934e86c

File tree

186 files changed

+224
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+224
-226
lines changed

‎.github/scripts/components-scripts/conformance-state.cloudflare.workerskv-setup.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ set -e
44

55
# Rebuild the Worker
66
(
7-
cd internal/component/cloudflare/worker-src;
7+
cd common/component/cloudflare/worker-src;
88
npm ci;
99
npm run build;
1010
)
1111

1212
# Check that the code of the worker is correct
13-
git diff --exit-code ./internal/component/cloudflare/workers/code \
14-
|| (echo "The source code of the Cloudflare Worker has changed, but the Worker has not been recompiled. Please re-compile the Worker by running 'npm ci && npm run build' in 'internal/component/cloudflare/worker-src'" && exit 1)
13+
git diff --exit-code ./common/component/cloudflare/workers/code \
14+
|| (echo "The source code of the Cloudflare Worker has changed, but the Worker has not been recompiled. Please re-compile the Worker by running 'npm ci && npm run build' in 'common/component/cloudflare/worker-src'" && exit 1)
1515

1616
# Remove dashes from UNIQUE_ID
1717
Suffix=$(echo "$UNIQUE_ID" | sed -E 's/-//g')

‎.github/scripts/test-info.mjs‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const components = {
1919
],
2020
sourcePkg: [
2121
'bindings/azure/blobstorage',
22-
'internal/component/azure/blobstorage',
22+
'common/component/azure/blobstorage',
2323
],
2424
},
2525
'bindings.azure.cosmosdb': {
@@ -73,7 +73,7 @@ const components = {
7373
],
7474
sourcePkg: [
7575
'bindings/azure/eventhubs',
76-
'internal/component/azure/eventhubs',
76+
'common/component/azure/eventhubs',
7777
],
7878
},
7979
'bindings.azure.servicebusqueues': {
@@ -82,7 +82,7 @@ const components = {
8282
requiredSecrets: ['AzureServiceBusConnectionString'],
8383
sourcePkg: [
8484
'bindings/azure/servicebusqueues',
85-
'internal/component/azure/servicebus',
85+
'common/component/azure/servicebus',
8686
],
8787
},
8888
'bindings.azure.storagequeues': {
@@ -135,17 +135,17 @@ const components = {
135135
},
136136
'bindings.kafka': {
137137
certification: true,
138-
sourcePkg: ['bindings/kafka', 'internal/component/kafka'],
138+
sourcePkg: ['bindings/kafka', 'common/component/kafka'],
139139
},
140140
'bindings.kafka-confluent': {
141141
conformance: true,
142142
conformanceSetup: 'docker-compose.sh confluent',
143-
sourcePkg: ['bindings/kafka', 'internal/component/kafka'],
143+
sourcePkg: ['bindings/kafka', 'common/component/kafka'],
144144
},
145145
'bindings.kafka-wurstmeister': {
146146
conformance: true,
147147
conformanceSetup: 'docker-compose.sh kafka',
148-
sourcePkg: ['bindings/kafka', 'internal/component/kafka'],
148+
sourcePkg: ['bindings/kafka', 'common/component/kafka'],
149149
},
150150
'bindings.kitex': {
151151
certification: true,
@@ -180,7 +180,7 @@ const components = {
180180
conformanceSetup: 'docker-compose.sh postgresql',
181181
sourcePkg: [
182182
'bindings/postgresql',
183-
'internal/authentication/postgresql',
183+
'common/authentication/postgresql',
184184
],
185185
},
186186
'bindings.postgresql.azure': {
@@ -193,7 +193,7 @@ const components = {
193193
],
194194
sourcePkg: [
195195
'bindings/postgresql',
196-
'internal/authentication/postgresql',
196+
'common/authentication/postgresql',
197197
],
198198
},
199199
'bindings.rabbitmq': {
@@ -203,31 +203,31 @@ const components = {
203203
},
204204
'bindings.redis': {
205205
certification: true,
206-
sourcePkg: ['bindings/redis', 'internal/component/redis'],
206+
sourcePkg: ['bindings/redis', 'common/component/redis'],
207207
},
208208
'bindings.redis.v6': {
209209
conformance: true,
210210
conformanceSetup: 'docker-compose.sh redisjson redis',
211-
sourcePkg: ['bindings/redis', 'internal/component/redis'],
211+
sourcePkg: ['bindings/redis', 'common/component/redis'],
212212
},
213213
'bindings.redis.v7': {
214214
conformance: true,
215215
conformanceSetup: 'docker-compose.sh redis7 redis',
216-
sourcePkg: ['bindings/redis', 'internal/component/redis'],
216+
sourcePkg: ['bindings/redis', 'common/component/redis'],
217217
},
218218
'configuration.postgres': {
219219
certification: true,
220220
sourcePkg: [
221221
'configuration/postgresql',
222-
'internal/authentication/postgresql',
222+
'common/authentication/postgresql',
223223
],
224224
},
225225
'configuration.postgresql.docker': {
226226
conformance: true,
227227
conformanceSetup: 'docker-compose.sh postgresql',
228228
sourcePkg: [
229229
'configuration/postgresql',
230-
'internal/authentication/postgresql',
230+
'common/authentication/postgresql',
231231
],
232232
},
233233
'configuration.postgresql.azure': {
@@ -240,7 +240,7 @@ const components = {
240240
],
241241
sourcePkg: [
242242
'configuration/postgresql',
243-
'internal/authentication/postgresql',
243+
'common/authentication/postgresql',
244244
],
245245
},
246246
'configuration.redis.v6': {
@@ -275,12 +275,12 @@ const components = {
275275
'lock.redis.v6': {
276276
conformance: true,
277277
conformanceSetup: 'docker-compose.sh redisjson redis',
278-
sourcePkg: ['lock/redis', 'internal/component/redis'],
278+
sourcePkg: ['lock/redis', 'common/component/redis'],
279279
},
280280
'lock.redis.v7': {
281281
conformance: true,
282282
conformanceSetup: 'docker-compose.sh redis7 redis',
283-
sourcePkg: ['lock/redis', 'internal/component/redis'],
283+
sourcePkg: ['lock/redis', 'common/component/redis'],
284284
},
285285
'middleware.http.bearer': {
286286
certification: true,
@@ -350,15 +350,15 @@ const components = {
350350
],
351351
sourcePkg: [
352352
'pubsub/azure/eventhubs',
353-
'internal/component/azure/eventhubs',
353+
'common/component/azure/eventhubs',
354354
],
355355
},
356356
'pubsub.azure.servicebus.queues': {
357357
conformance: true,
358358
requiredSecrets: ['AzureServiceBusConnectionString'],
359359
sourcePkg: [
360360
'pubsub/azure/servicebus/queues',
361-
'internal/component/azure/servicebus',
361+
'common/component/azure/servicebus',
362362
],
363363
},
364364
'pubsub.azure.servicebus.topics': {
@@ -373,7 +373,7 @@ const components = {
373373
],
374374
sourcePkg: [
375375
'pubsub/azure/servicebus/topics',
376-
'internal/component/azure/servicebus',
376+
'common/component/azure/servicebus',
377377
],
378378
},
379379
'pubsub.in-memory': {
@@ -385,17 +385,17 @@ const components = {
385385
},
386386
'pubsub.kafka': {
387387
certification: true,
388-
sourcePkg: ['pubsub/kafka', 'internal/component/kafka'],
388+
sourcePkg: ['pubsub/kafka', 'common/component/kafka'],
389389
},
390390
'pubsub.kafka-confluent': {
391391
conformance: true,
392392
conformanceSetup: 'docker-compose.sh confluent',
393-
sourcePkg: ['pubsub/kafka', 'internal/component/kafka'],
393+
sourcePkg: ['pubsub/kafka', 'common/component/kafka'],
394394
},
395395
'pubsub.kafka-wurstmeister': {
396396
conformance: true,
397397
conformanceSetup: 'docker-compose.sh kafka',
398-
sourcePkg: ['pubsub/kafka', 'internal/component/kafka'],
398+
sourcePkg: ['pubsub/kafka', 'common/component/kafka'],
399399
},
400400
'pubsub.kubemq': {
401401
conformance: true,
@@ -427,7 +427,7 @@ const components = {
427427
'pubsub.redis.v6': {
428428
conformance: true,
429429
conformanceSetup: 'docker-compose.sh redisjson redis',
430-
sourcePkg: ['pubsub/redis', 'internal/component/redis'],
430+
sourcePkg: ['pubsub/redis', 'common/component/redis'],
431431
},
432432
// This test is currently disabled due to issues with Redis v7
433433
/*'pubsub.redis.v7': {
@@ -521,7 +521,7 @@ const components = {
521521
],
522522
sourcePkg: [
523523
'state/azure/blobstorage',
524-
'internal/component/azure/blobstorage',
524+
'common/component/azure/blobstorage',
525525
],
526526
},
527527
'state.azure.blobstorage.v1': {
@@ -536,7 +536,7 @@ const components = {
536536
],
537537
sourcePkg: [
538538
'state/azure/blobstorage',
539-
'internal/component/azure/blobstorage',
539+
'common/component/azure/blobstorage',
540540
],
541541
},
542542
'state.azure.blobstorage': {
@@ -551,7 +551,7 @@ const components = {
551551
],
552552
sourcePkg: [
553553
'state/azure/blobstorage',
554-
'internal/component/azure/blobstorage',
554+
'common/component/azure/blobstorage',
555555
],
556556
},
557557
'state.azure.cosmosdb': {
@@ -621,8 +621,8 @@ const components = {
621621
conformanceSetup: 'docker-compose.sh cockroachdb',
622622
sourcePkg: [
623623
'state/cockroachdb',
624-
'internal/component/postgresql',
625-
'internal/component/sql',
624+
'common/component/postgresql',
625+
'common/component/sql',
626626
],
627627
},
628628
'state.etcd.v1': {
@@ -648,17 +648,17 @@ const components = {
648648
},
649649
'state.mysql': {
650650
certification: true,
651-
sourcePkg: ['state/mysql', 'internal/component/sql'],
651+
sourcePkg: ['state/mysql', 'common/component/sql'],
652652
},
653653
'state.mysql.mariadb': {
654654
conformance: true,
655655
conformanceSetup: 'docker-compose.sh mariadb',
656-
sourcePkg: ['state/mysql', 'internal/component/sql'],
656+
sourcePkg: ['state/mysql', 'common/component/sql'],
657657
},
658658
'state.mysql.mysql': {
659659
conformance: true,
660660
conformanceSetup: 'docker-compose.sh mysql',
661-
sourcePkg: ['state/mysql', 'internal/component/sql'],
661+
sourcePkg: ['state/mysql', 'common/component/sql'],
662662
},
663663
'state.oracledatabase': {
664664
conformance: true,
@@ -668,19 +668,19 @@ const components = {
668668
certification: true,
669669
sourcePkg: [
670670
'state/postgresql',
671-
'internal/authentication/postgresql',
672-
'internal/component/postgresql',
673-
'internal/component/sql',
671+
'common/authentication/postgresql',
672+
'common/component/postgresql',
673+
'common/component/sql',
674674
],
675675
},
676676
'state.postgresql.docker': {
677677
conformance: true,
678678
conformanceSetup: 'docker-compose.sh postgresql',
679679
sourcePkg: [
680680
'state/postgresql',
681-
'internal/authentication/postgresql',
682-
'internal/component/postgresql',
683-
'internal/component/sql',
681+
'common/authentication/postgresql',
682+
'common/component/postgresql',
683+
'common/component/sql',
684684
],
685685
},
686686
'state.postgresql.azure': {
@@ -693,24 +693,24 @@ const components = {
693693
],
694694
sourcePkg: [
695695
'state/postgresql',
696-
'internal/authentication/postgresql',
697-
'internal/component/postgresql',
698-
'internal/component/sql',
696+
'common/authentication/postgresql',
697+
'common/component/postgresql',
698+
'common/component/sql',
699699
],
700700
},
701701
'state.redis': {
702702
certification: true,
703-
sourcePkg: ['state/redis', 'internal/component/redis'],
703+
sourcePkg: ['state/redis', 'common/component/redis'],
704704
},
705705
'state.redis.v6': {
706706
conformance: true,
707707
conformanceSetup: 'docker-compose.sh redisjson redis',
708-
sourcePkg: ['state/redis', 'internal/component/redis'],
708+
sourcePkg: ['state/redis', 'common/component/redis'],
709709
},
710710
'state.redis.v7': {
711711
conformance: true,
712712
conformanceSetup: 'docker-compose.sh redis7 redis',
713-
sourcePkg: ['state/redis', 'internal/component/redis'],
713+
sourcePkg: ['state/redis', 'common/component/redis'],
714714
},
715715
'state.rethinkdb': {
716716
conformance: true,
@@ -719,14 +719,14 @@ const components = {
719719
'state.sqlite': {
720720
conformance: true,
721721
certification: true,
722-
sourcePkg: ['state/sqlite', 'internal/component/sql'],
722+
sourcePkg: ['state/sqlite', 'common/component/sql'],
723723
},
724724
'state.sqlserver': {
725725
conformance: true,
726726
certification: true,
727727
conformanceSetup: 'docker-compose.sh sqlserver',
728728
requiredSecrets: ['AzureSqlServerConnectionString'],
729-
sourcePkg: ['state/sqlserver', 'internal/component/sql'],
729+
sourcePkg: ['state/sqlserver', 'common/component/sql'],
730730
},
731731
// 'state.gcp.firestore.docker': {
732732
// conformance: true,

‎.prettierignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
internal/component/cloudflare/workers/code/
1+
common/component/cloudflare/workers/code/

‎bindings/aws/dynamodb/dynamodb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute"
2424

2525
"github.com/dapr/components-contrib/bindings"
26-
awsAuth "github.com/dapr/components-contrib/internal/authentication/aws"
26+
awsAuth "github.com/dapr/components-contrib/common/authentication/aws"
2727
"github.com/dapr/components-contrib/metadata"
2828
"github.com/dapr/kit/logger"
2929
kitmd "github.com/dapr/kit/metadata"

‎bindings/aws/kinesis/kinesis.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/vmware/vmware-go-kcl/clientlibrary/worker"
3434

3535
"github.com/dapr/components-contrib/bindings"
36-
awsAuth "github.com/dapr/components-contrib/internal/authentication/aws"
36+
awsAuth "github.com/dapr/components-contrib/common/authentication/aws"
3737
"github.com/dapr/components-contrib/metadata"
3838
"github.com/dapr/kit/logger"
3939
kitmd "github.com/dapr/kit/metadata"

‎bindings/aws/s3/s3.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ import (
3636
"github.com/google/uuid"
3737

3838
"github.com/dapr/components-contrib/bindings"
39-
awsAuth "github.com/dapr/components-contrib/internal/authentication/aws"
40-
internalutils "github.com/dapr/components-contrib/internal/utils"
39+
awsAuth "github.com/dapr/components-contrib/common/authentication/aws"
40+
commonutils "github.com/dapr/components-contrib/common/utils"
4141
"github.com/dapr/components-contrib/metadata"
4242
"github.com/dapr/kit/logger"
4343
kitmd "github.com/dapr/kit/metadata"
@@ -188,7 +188,7 @@ func (s *AWSS3) create(ctx context.Context, req *bindings.InvokeRequest) (*bindi
188188
return nil, fmt.Errorf("s3 binding error: file read error: %w", err)
189189
}
190190
} else {
191-
r = strings.NewReader(internalutils.Unquote(req.Data))
191+
r = strings.NewReader(commonutils.Unquote(req.Data))
192192
}
193193

194194
if metadata.DecodeBase64 {

‎bindings/aws/ses/ses.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/aws/aws-sdk-go/service/ses"
2525

2626
"github.com/dapr/components-contrib/bindings"
27-
awsAuth "github.com/dapr/components-contrib/internal/authentication/aws"
27+
awsAuth "github.com/dapr/components-contrib/common/authentication/aws"
2828
contribMetadata "github.com/dapr/components-contrib/metadata"
2929
"github.com/dapr/kit/logger"
3030
kitmd "github.com/dapr/kit/metadata"

‎bindings/aws/sns/sns.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/aws/aws-sdk-go/service/sns"
2323

2424
"github.com/dapr/components-contrib/bindings"
25-
awsAuth "github.com/dapr/components-contrib/internal/authentication/aws"
25+
awsAuth "github.com/dapr/components-contrib/common/authentication/aws"
2626
"github.com/dapr/components-contrib/metadata"
2727
"github.com/dapr/kit/logger"
2828
kitmd "github.com/dapr/kit/metadata"

0 commit comments

Comments
 (0)