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

ACR Integration: Publish-PSResource methods #1501

Merged
merged 18 commits into from
Jan 2, 2024
Merged

ACR Integration: Publish-PSResource methods #1501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2b2e9be
Update SecretManagement credential use with ACR repos
alerickson Dec 23, 2023
4fa8cc5
Update ACR response class to work with ACR responses
alerickson Dec 23, 2023
0319bb3
Add method to convert from ACR response to PSResourceInfo object
alerickson Dec 23, 2023
9771ed0
Implement FindName for ACR server
alerickson Dec 23, 2023
a94c87f
Implement FindVersion
alerickson Dec 24, 2023
2a2f146
ACR FindVersionGlobbing implementation
alerickson Dec 24, 2023
a838308
Add ACR tests
alerickson Dec 24, 2023
34199e8
Bug fixes for failing tests, start install work
alerickson Dec 27, 2023
842e717
Refactor request calls
alerickson Dec 27, 2023
5fb1abc
Bug fixes for ACR tests
alerickson Dec 27, 2023
c6ac20d
Finish cleaning up all ACR find cmdlets
alerickson Dec 27, 2023
9fb2f65
Pull in upstream changes
alerickson Dec 27, 2023
2db10d1
Remove unnecessary using directives
alerickson Dec 27, 2023
b931d82
Comment out ACR tests due to lack of automated testing
alerickson Dec 27, 2023
f9a3101
Integrate ACR publish
alerickson Dec 28, 2023
90a773f
Update publish condition to check for APIVersion
alerickson Dec 28, 2023
9baf6d8
add comment
alerickson Jan 2, 2024
4419cb9
remove comment
alerickson Jan 2, 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
2 changes: 1 addition & 1 deletion src/code/ACRServerAPICalls.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ private static Collection<KeyValuePair<string, string>> GetDefaultHeaders(string
};
}

private bool PushNupkgACR(string outputNupkgDir, string pkgName, NuGetVersion pkgVersion, PSRepositoryInfo repository, out ErrorRecord errRecord)
internal bool PushNupkgACR(string outputNupkgDir, string pkgName, NuGetVersion pkgVersion, PSRepositoryInfo repository, out ErrorRecord errRecord)
{
errRecord = null;
// Push the nupkg to the appropriate repository
Expand Down
14 changes: 7 additions & 7 deletions src/code/PublishPSResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
using System.Management.Automation;
using System.Net;
using System.Net.Http;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Xml;

Expand Down Expand Up @@ -138,6 +136,8 @@ public PSCredential ProxyCredential {
private string pathToModuleDirToPublish = string.Empty;
private ResourceType resourceType = ResourceType.None;
private NetworkCredential _networkCredential;
string userAgentString = UserAgentInfo.UserAgentString();

#endregion

#region Method overrides
Expand Down Expand Up @@ -482,16 +482,16 @@ out string[] _

string repositoryUri = repository.Uri.AbsoluteUri;

if (repository.RepositoryProvider == PSRepositoryInfo.RepositoryProviderType.ACR)
if (repository.ApiVersion == PSRepositoryInfo.APIVersion.acr)
{
// TODO: Create instance of ACR server class and call PushNupkgACR
/*
if (!PushNupkgACR(outputNupkgDir, repository, out ErrorRecord pushNupkgACRError))
ACRServerAPICalls acrServer = new ACRServerAPICalls(repository, this, _networkCredential, userAgentString);

if (!acrServer.PushNupkgACR(outputNupkgDir, _pkgName, _pkgVersion, repository, out ErrorRecord pushNupkgACRError))
{
WriteError(pushNupkgACRError);
// exit out of processing
return;
}
*/
}
else
{
Expand Down
Loading