Skip to content

Commit 23cb811

Browse files
committed
chore: azure env
1 parent 47b1ccc commit 23cb811

File tree

2 files changed

+26
-16
lines changed

2 files changed

+26
-16
lines changed

.env.example

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@ RABBITMQ_LOG_QUEUE="outpost-log"
5454
# GCP_PUBSUB_LOG_TOPIC="outpost-log"
5555
# GCP_PUBSUB_LOG_SUBSCRIPTION="outpost-log-sub"
5656

57+
## Azure ServiceBus
58+
AZURE_SERVICEBUS_TENANT_ID=""
59+
AZURE_SERVICEBUS_CLIENT_ID=""
60+
AZURE_SERVICEBUS_CLIENT_SECRET=""
61+
AZURE_SERVICEBUS_SUBSCRIPTION_ID=""
62+
AZURE_SERVICEBUS_RESOURCE_GROUP=""
63+
AZURE_SERVICEBUS_NAMESPACE=""
64+
AZURE_SERVICEBUS_DELIVERY_TOPIC="outpost-delivery"
65+
AZURE_SERVICEBUS_DELIVERY_SUBSCRIPTION="outpost-delivery-sub"
66+
AZURE_SERVICEBUS_LOG_TOPIC="outpost-log"
67+
AZURE_SERVICEBUS_LOG_SUBSCRIPTION="outpost-log-sub"
5768

5869

5970
# ============================== PublishMQ ==============================

internal/config/mqconfig_azure.go

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package config
33
import (
44
"context"
55
"fmt"
6-
"sync"
76

87
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
98
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/servicebus/armservicebus"
@@ -12,21 +11,21 @@ import (
1211
)
1312

1413
type AzureServiceBusConfig struct {
15-
TenantID string `yaml:"tenant_id" desc:"Azure Active Directory tenant ID" required:"Y"`
16-
ClientID string `yaml:"client_id" desc:"Service principal client ID" required:"Y"`
17-
ClientSecret string `yaml:"client_secret" desc:"Service principal client secret" required:"Y"`
18-
SubscriptionID string `yaml:"subscription_id" desc:"Azure subscription ID" required:"Y"`
19-
ResourceGroup string `yaml:"resource_group" desc:"Azure resource group name" required:"Y"`
20-
Namespace string `yaml:"namespace" desc:"Azure Service Bus namespace" required:"Y"`
21-
22-
DeliveryTopic string `yaml:"delivery_topic" desc:"Topic name for delivery queue" required:"N" default:"outpost-delivery"`
23-
DeliverySubscription string `yaml:"delivery_subscription" desc:"Subscription name for delivery queue" required:"N" default:"outpost-delivery-subscription"`
24-
LogTopic string `yaml:"log_topic" desc:"Topic name for log queue" required:"N" default:"outpost-log"`
25-
LogSubscription string `yaml:"log_subscription" desc:"Subscription name for log queue" required:"N" default:"outpost-log-subscription"`
26-
27-
connectionStringOnce sync.Once
28-
connectionString string
29-
connectionStringError error
14+
TenantID string `yaml:"tenant_id" env:"AZURE_SERVICEBUS_TENANT_ID" desc:"Azure Active Directory tenant ID" required:"Y"`
15+
ClientID string `yaml:"client_id" env:"AZURE_SERVICEBUS_CLIENT_ID" desc:"Service principal client ID" required:"Y"`
16+
ClientSecret string `yaml:"client_secret" env:"AZURE_SERVICEBUS_CLIENT_SECRET" desc:"Service principal client secret" required:"Y"`
17+
SubscriptionID string `yaml:"subscription_id" env:"AZURE_SERVICEBUS_SUBSCRIPTION_ID" desc:"Azure subscription ID" required:"Y"`
18+
ResourceGroup string `yaml:"resource_group" env:"AZURE_SERVICEBUS_RESOURCE_GROUP" desc:"Azure resource group name" required:"Y"`
19+
Namespace string `yaml:"namespace" env:"AZURE_SERVICEBUS_NAMESPACE" desc:"Azure Service Bus namespace" required:"Y"`
20+
21+
DeliveryTopic string `yaml:"delivery_topic" env:"AZURE_SERVICEBUS_DELIVERY_TOPIC" desc:"Topic name for delivery queue" required:"N" default:"outpost-delivery"`
22+
DeliverySubscription string `yaml:"delivery_subscription" env:"AZURE_SERVICEBUS_DELIVERY_SUBSCRIPTION" desc:"Subscription name for delivery queue" required:"N" default:"outpost-delivery-subscription"`
23+
LogTopic string `yaml:"log_topic" env:"AZURE_SERVICEBUS_LOG_TOPIC" desc:"Topic name for log queue" required:"N" default:"outpost-log"`
24+
LogSubscription string `yaml:"log_subscription" env:"AZURE_SERVICEBUS_LOG_SUBSCRIPTION" desc:"Subscription name for log queue" required:"N" default:"outpost-log-subscription"`
25+
26+
// connectionStringOnce sync.Once
27+
// connectionString string
28+
// connectionStringError error
3029
}
3130

3231
func (c *AzureServiceBusConfig) IsConfigured() bool {

0 commit comments

Comments
 (0)