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.

Sign up for GitHub

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

Update account usage resource to include tenant variables #886

Merged
merged 6 commits into from
Oct 28, 2024
Merged

Update account usage resource to include tenant variables #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a87784
Update account usage resouce to unclude tenant variables
grace-rehn Oct 28, 2024
066db7d
Update PublicSurfaceAreaFixture files
grace-rehn Oct 28, 2024
b535c0e
Fix up test types
grace-rehn Oct 28, 2024
f742d87
Fix ordering
grace-rehn Oct 28, 2024
805de32
Wrong id
grace-rehn Oct 28, 2024
f1123cc
Fix indentation
grace-rehn Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions ...Tests/PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETCore.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6378,20 +6378,46 @@ Octopus.Client.Model.Accounts.Usages
Octopus.Client.Model.Resource
{
.ctor()
ICollection<CommonTenantVariableUsage> CommonTenantVariables { get; set; }
ICollection<StepUsage> DeploymentProcesses { get; set; }
ICollection<LibraryVariableSetUsageEntry> LibraryVariableSets { get; set; }
ICollection<ProjectTenantVariableUsage> ProjectTenantVariables { get; set; }
ICollection<ProjectVariableSetUsage> ProjectVariableSets { get; set; }
ICollection<ReleaseUsage> Releases { get; set; }
ICollection<RunbookStepUsage> RunbookProcesses { get; set; }
ICollection<RunbookSnapshotUsage> RunbookSnapshots { get; set; }
ICollection<TargetUsageEntry> Targets { get; set; }
}
class CommonTenantVariableUsage
{
.ctor()
ICollection<CommonTenantVariableUsageEntry> LibraryVariableSets { get; set; }
String TenantId { get; set; }
}
class CommonTenantVariableUsageEntry
{
.ctor()
String LibraryVariableSetId { get; set; }
String TenantVariableId { get; set; }
}
class LibraryVariableSetUsageEntry
{
.ctor()
String LibraryVariableSetId { get; set; }
String LibraryVariableSetName { get; set; }
}
class ProjectTenantVariableEntry
{
.ctor()
String ProjectId { get; set; }
ICollection<String> TenantVariableIds { get; set; }
}
class ProjectTenantVariableUsage
{
.ctor()
ICollection<ProjectTenantVariableEntry> Projects { get; set; }
String TenantId { get; set; }
}
class ProjectVariableSetUsage
{
.ctor()
Expand Down
26 changes: 26 additions & 0 deletions .../PublicSurfaceAreaFixture.ThePublicSurfaceAreaShouldNotRegress..NETFramework.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6402,20 +6402,46 @@ Octopus.Client.Model.Accounts.Usages
Octopus.Client.Model.Resource
{
.ctor()
ICollection<CommonTenantVariableUsage> CommonTenantVariables { get; set; }
ICollection<StepUsage> DeploymentProcesses { get; set; }
ICollection<LibraryVariableSetUsageEntry> LibraryVariableSets { get; set; }
ICollection<ProjectTenantVariableUsage> ProjectTenantVariables { get; set; }
ICollection<ProjectVariableSetUsage> ProjectVariableSets { get; set; }
ICollection<ReleaseUsage> Releases { get; set; }
ICollection<RunbookStepUsage> RunbookProcesses { get; set; }
ICollection<RunbookSnapshotUsage> RunbookSnapshots { get; set; }
ICollection<TargetUsageEntry> Targets { get; set; }
}
class CommonTenantVariableUsage
{
.ctor()
ICollection<CommonTenantVariableUsageEntry> LibraryVariableSets { get; set; }
String TenantId { get; set; }
}
class CommonTenantVariableUsageEntry
{
.ctor()
String LibraryVariableSetId { get; set; }
String TenantVariableId { get; set; }
}
class LibraryVariableSetUsageEntry
{
.ctor()
String LibraryVariableSetId { get; set; }
String LibraryVariableSetName { get; set; }
}
class ProjectTenantVariableEntry
{
.ctor()
String ProjectId { get; set; }
ICollection<String> TenantVariableIds { get; set; }
}
class ProjectTenantVariableUsage
{
.ctor()
ICollection<ProjectTenantVariableEntry> Projects { get; set; }
String TenantId { get; set; }
}
class ProjectVariableSetUsage
{
.ctor()
Expand Down
41 changes: 41 additions & 0 deletions source/Octopus.Server.Client/Model/Accounts/Usages/AccountUsageResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ public AccountUsageResource()
LibraryVariableSets = new List<LibraryVariableSetUsageEntry>();
RunbookProcesses = new List<RunbookStepUsage>();
RunbookSnapshots = new List<RunbookSnapshotUsage>();
ProjectTenantVariables = new List<ProjectTenantVariableUsage>();
CommonTenantVariables = new List<CommonTenantVariableUsage>();
}

public ICollection<TargetUsageEntry> Targets { get; set; }
Expand All @@ -23,6 +25,8 @@ public AccountUsageResource()
public ICollection<LibraryVariableSetUsageEntry> LibraryVariableSets { get; set; }
public ICollection<RunbookStepUsage> RunbookProcesses { get; set; }
public ICollection<RunbookSnapshotUsage> RunbookSnapshots { get; set; }
public ICollection<ProjectTenantVariableUsage> ProjectTenantVariables { get; set; }
public ICollection<CommonTenantVariableUsage> CommonTenantVariables { get; set; }
}

public class StepUsageBase
Expand Down Expand Up @@ -119,4 +123,41 @@ public class RunbookSnapshotUsageEntry
public string SnapshotId { get; set; }
public string SnapshotName { get; set; }
}

public class ProjectTenantVariableUsage
{
public ProjectTenantVariableUsage()
{
Projects = new List<ProjectTenantVariableEntry>();
}
public string TenantId { get; set; }
public ICollection<ProjectTenantVariableEntry> Projects { get; set; }
}

public class ProjectTenantVariableEntry
{
public ProjectTenantVariableEntry()
{
TenantVariableIds = new List<string>();
}
public string ProjectId { get; set; }
public ICollection<string> TenantVariableIds { get; set; }
}

public class CommonTenantVariableUsage
{
public CommonTenantVariableUsage()
{
LibraryVariableSets = new List<CommonTenantVariableUsageEntry>();
}
public string TenantId { get; set; }
public ICollection<CommonTenantVariableUsageEntry> LibraryVariableSets { get; set; }

}

public class CommonTenantVariableUsageEntry
{
public string LibraryVariableSetId { get; set; }
public string TenantVariableId { get; set; }
}
}
Loading