Skip to content

Commit 8df8f16

Browse files
committed
Throw error message if no server or profile is present
1 parent a02a44a commit 8df8f16

1 file changed

Lines changed: 70 additions & 1 deletion

File tree

src/StorageGRID-Webscale.psm1

Lines changed: 70 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,9 @@ function Global:Get-SgwAccounts {
980980
}
981981
if ($ProfileName) {
982982
$Profile = Get-SgwProfile -ProfileName $ProfileName
983+
if (!$Profile.Name) {
984+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
985+
}
983986
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
984987
}
985988

@@ -1147,6 +1150,9 @@ function Global:New-SgwAccount {
11471150
}
11481151
if ($ProfileName) {
11491152
$Profile = Get-SgwProfile -ProfileName $ProfileName
1153+
if (!$Profile.Name) {
1154+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
1155+
}
11501156
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
11511157
}
11521158

@@ -1258,6 +1264,9 @@ function Global:Remove-SgwAccount {
12581264
}
12591265
if ($ProfileName) {
12601266
$Profile = Get-SgwProfile -ProfileName $ProfileName
1267+
if (!$Profile.Name) {
1268+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
1269+
}
12611270
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
12621271
}
12631272

@@ -1334,6 +1343,9 @@ function Global:Get-SgwAccount {
13341343
}
13351344
if ($ProfileName) {
13361345
$Profile = Get-SgwProfile -ProfileName $ProfileName
1346+
if (!$Profile.Name) {
1347+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
1348+
}
13371349
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
13381350
}
13391351

@@ -1446,6 +1458,9 @@ function Global:Update-SgwAccount {
14461458
}
14471459
if ($ProfileName) {
14481460
$Profile = Get-SgwProfile -ProfileName $ProfileName
1461+
if (!$Profile.Name) {
1462+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
1463+
}
14491464
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
14501465
}
14511466

@@ -1581,6 +1596,9 @@ function Global:Replace-SgwAccount {
15811596
}
15821597
if ($ProfileName) {
15831598
$Profile = Get-SgwProfile -ProfileName $ProfileName
1599+
if (!$Profile.Name) {
1600+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
1601+
}
15841602
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
15851603
}
15861604

@@ -1698,6 +1716,9 @@ function Global:Update-SgwSwiftAdminPassword {
16981716
}
16991717
if ($ProfileName) {
17001718
$Profile = Get-SgwProfile -ProfileName $ProfileName
1719+
if (!$Profile.Name) {
1720+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
1721+
}
17011722
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
17021723
}
17031724

@@ -1782,6 +1803,9 @@ function Global:Update-SgwPassword {
17821803
}
17831804
if ($ProfileName) {
17841805
$Profile = Get-SgwProfile -ProfileName $ProfileName
1806+
if (!$Profile.Name) {
1807+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
1808+
}
17851809
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
17861810
}
17871811

@@ -1854,6 +1878,9 @@ function Global:Get-SgwAccountUsage {
18541878
}
18551879
if ($ProfileName) {
18561880
$Profile = Get-SgwProfile -ProfileName $ProfileName
1881+
if (!$Profile.Name) {
1882+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
1883+
}
18571884
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
18581885
}
18591886

@@ -1937,6 +1964,9 @@ function Global:Get-SgwAlarms {
19371964
}
19381965
if ($ProfileName) {
19391966
$Profile = Get-SgwProfile -ProfileName $ProfileName
1967+
if (!$Profile.Name) {
1968+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
1969+
}
19401970
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
19411971
}
19421972

@@ -2008,6 +2038,9 @@ function Global:Get-SgwAudit {
20082038
}
20092039
if ($ProfileName) {
20102040
$Profile = Get-SgwProfile -ProfileName $ProfileName
2041+
if (!$Profile.Name) {
2042+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
2043+
}
20112044
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
20122045
}
20132046

@@ -2109,6 +2142,9 @@ function Global:Replace-SgwAudit {
21092142
}
21102143
if ($ProfileName) {
21112144
$Profile = Get-SgwProfile -ProfileName $ProfileName
2145+
if (!$Profile.Name) {
2146+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
2147+
}
21122148
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
21132149
}
21142150

@@ -2280,6 +2316,9 @@ function global:Connect-SgwServer {
22802316
Process {
22812317
if (!$Name) {
22822318
$Profile = Get-SgwProfile -ProfileName $ProfileName
2319+
if (!$Profile.Name) {
2320+
Throw "Profile $ProfileName not found and no name specified."
2321+
}
22832322
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient:$Transient
22842323
return $Server
22852324
}
@@ -2543,6 +2582,9 @@ function Global:Get-SgwCompliance {
25432582
}
25442583
if ($ProfileName) {
25452584
$Profile = Get-SgwProfile -ProfileName $ProfileName
2585+
if (!$Profile.Name) {
2586+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
2587+
}
25462588
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
25472589
}
25482590

@@ -2598,6 +2640,9 @@ function Global:Enable-SgwCompliance {
25982640
}
25992641
if ($ProfileName) {
26002642
$Profile = Get-SgwProfile -ProfileName $ProfileName
2643+
if (!$Profile.Name) {
2644+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
2645+
}
26012646
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
26022647
}
26032648

@@ -2667,6 +2712,9 @@ function Global:Get-SgwConfig {
26672712
}
26682713
if ($ProfileName) {
26692714
$Profile = Get-SgwProfile -ProfileName $ProfileName
2715+
if (!$Profile.Name) {
2716+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
2717+
}
26702718
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
26712719
}
26722720

@@ -2728,6 +2776,9 @@ function Global:Get-SgwConfigManagement {
27282776
}
27292777
if ($ProfileName) {
27302778
$Profile = Get-SgwProfile -ProfileName $ProfileName
2779+
if (!$Profile.Name) {
2780+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
2781+
}
27312782
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
27322783
}
27332784

@@ -2795,6 +2846,9 @@ function Global:Update-SgwConfigManagement {
27952846
}
27962847
if ($ProfileName) {
27972848
$Profile = Get-SgwProfile -ProfileName $ProfileName
2849+
if (!$Profile.Name) {
2850+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
2851+
}
27982852
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
27992853
}
28002854

@@ -2860,6 +2914,9 @@ function Global:Get-SgwProductVersion {
28602914
}
28612915
if ($ProfileName) {
28622916
$Profile = Get-SgwProfile -ProfileName $ProfileName
2917+
if (!$Profile.Name) {
2918+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
2919+
}
28632920
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
28642921
}
28652922

@@ -2921,6 +2978,9 @@ function Global:Get-SgwVersion {
29212978
}
29222979
if ($ProfileName) {
29232980
$Profile = Get-SgwProfile -ProfileName $ProfileName
2981+
if (!$Profile.Name) {
2982+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
2983+
}
29242984
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
29252985
}
29262986

@@ -2984,6 +3044,9 @@ function Global:Get-SgwVersions {
29843044
}
29853045
if ($ProfileName) {
29863046
$Profile = Get-SgwProfile -ProfileName $ProfileName
3047+
if (!$Profile.Name) {
3048+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
3049+
}
29873050
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
29883051
}
29893052

@@ -4614,8 +4677,14 @@ function Global:Get-SgwEndpoints {
46144677
)
46154678

46164679
Begin {
4617-
if (!$Server -and !$CurrentSgwServer.Name) {
4680+
if (!$ProfileName -and !$Server -and !$CurrentSgwServer.Name) {
4681+
$ProfileName = "default"
4682+
}
4683+
if ($ProfileName) {
46184684
$Profile = Get-SgwProfile -ProfileName $ProfileName
4685+
if (!$Profile.Name) {
4686+
Throw "Profile $ProfileName not found. Create a profile using New-SgwProfile or connect to a StorageGRID Server using Connect-SgwServer"
4687+
}
46194688
$Server = Connect-SgwServer -Name $Profile.Name -Credential $Profile.Credential -AccountId $Profile.AccountId -SkipCertificateCheck:$Profile.SkipCertificateCheck -DisableAutomaticAccessKeyGeneration:$Profile.disalble_automatic_access_key_generation -TemporaryAccessKeyExpirationTime $Profile.temporary_access_key_expiration_time -S3EndpointUrl $Profile.S3EndpointUrl -SwiftEndpointUrl $Profile.SwiftEndpointUrl -Transient
46204689
}
46214690

0 commit comments

Comments
 (0)