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

feat: removed unused html, moved html for better caching and remove d… #265

Merged
merged 1 commit into from
Oct 14, 2024
Merged

feat: removed unused html, moved html for better caching and remove d… #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 16 deletions src/main/resources/com/microsoft/azure/util/AzureCredentials/credentials.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,36 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:c="/lib/credentials">
<j:set var="uniqueId" value="${h.generateId()}"/>
<f:entry title="${%SubscriptionID}" field="subscriptionId"
help="/plugin/azure-credentials/help-subscriptionId.html">
<f:entry title="${%SubscriptionID}" field="subscriptionId" help="/plugin/azure-credentials/help-subscriptionId.html">
<f:textbox/>
</f:entry>
<f:entry title="${%ClientID}" field="clientId" help="/plugin/azure-credentials/help-clientId.html">
<f:entry title="${%ClientID}" field="clientId">
<f:textbox/>
</f:entry>
<f:entry title="${%ClientSecret}" field="clientSecret" help="/plugin/azure-credentials/help-clientSecret.html">
<f:entry title="${%ClientSecret}" field="clientSecret" >
<f:password/>
</f:entry>
<f:entry title="${%CertificateId}" field="certificateId" help="/plugin/azure-credentials/help-certificateId.html">
<f:entry title="${%CertificateId}" field="certificateId">
<c:select expressionAllowed="false" checkMethod="post" />
</f:entry>
<f:entry title="${%Tenant}" field="tenant" help="/plugin/azure-credentials/help-tenant.html">
<f:entry title="${%Tenant}" field="tenant">
<f:textbox/>
</f:entry>
<f:entry title="${%AzureEnvironmentName}" field="azureEnvironmentName"
help="/plugin/azure-credentials/help-azureEnvironmentName.html">
<f:entry title="${%AzureEnvironmentName}" field="azureEnvironmentName" help="/plugin/azure-credentials/help-azureEnvironmentName.html">
<f:select/>
</f:entry>

<f:advanced>
<f:entry title="${%ManagementServiceURL}" field="serviceManagementURL"
help="/plugin/azure-credentials/help-serviceManagementURL.html">
<f:entry title="${%ManagementServiceURL}" field="serviceManagementURL">
<f:textbox/>
</f:entry>
<f:entry title="${%AuthEndpoint}" field="authenticationEndpoint"
help="/plugin/azure-credentials/help-authenticationEndpoint.html">
<f:entry title="${%AuthEndpoint}" field="authenticationEndpoint">
<f:textbox/>
</f:entry>
<f:entry title="${%ResourceManagerURL}" field="resourceManagerEndpoint"
help="/plugin/azure-credentials/help-resourceManagerEndpoint.html">
<f:entry title="${%ResourceManagerURL}" field="resourceManagerEndpoint">
<f:textbox/>
</f:entry>
<f:entry title="${%GraphEndpointURL}" field="graphEndpoint"
help="/plugin/azure-credentials/help-graphEndpoint.html">
<f:entry title="${%GraphEndpointURL}" field="graphEndpoint">
<f:textbox/>
</f:entry>
</f:advanced>
Expand Down
0 ...n/webapp/help-authenticationEndpoint.html → ...dentials/help-authenticationEndpoint.html
View file
Open in desktop
File renamed without changes.
0 src/main/webapp/help-certificateId.html → .../AzureCredentials/help-certificateId.html
View file
Open in desktop
File renamed without changes.
0 src/main/webapp/help-clientId.html → .../util/AzureCredentials/help-clientId.html
View file
Open in desktop
File renamed without changes.
0 src/main/webapp/help-clientSecret.html → ...l/AzureCredentials/help-clientSecret.html
View file
Open in desktop
File renamed without changes.
0 src/main/webapp/help-graphEndpoint.html → .../AzureCredentials/help-graphEndpoint.html
View file
Open in desktop
File renamed without changes.
0 .../webapp/help-resourceManagerEndpoint.html → ...entials/help-resourceManagerEndpoint.html
View file
Open in desktop
File renamed without changes.
0 ...ain/webapp/help-serviceManagementURL.html → ...redentials/help-serviceManagementURL.html
View file
Open in desktop
File renamed without changes.
0 src/main/webapp/help-tenant.html → ...re/util/AzureCredentials/help-tenant.html
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions src/main/resources/com/microsoft/azure/util/AzureCredentialsBinding/config-variables.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:c="/lib/credentials">
<f:entry title="${%SubscriptionIdVariable}" field="subscriptionIdVariable" help="/plugin/azure-credentials/help-subscriptionIdVariable.html">
<f:entry title="${%SubscriptionIdVariable}" field="subscriptionIdVariable">
<f:textbox default="${descriptor.getDefaultSubscriptionIdVariable()}"/>
</f:entry>
<f:entry title="${%ClientIdVariable}" field="clientIdVariable" help="/plugin/azure-credentials/help-clientIdVariable.html">
<f:textbox default="${descriptor.getDefaultClientIdVariable()}"/>
</f:entry>
<f:entry title="${%ClientSecretVariable}" field="clientSecretVariable" help="/plugin/azure-credentials/help-clientSecretVariable.html">
<f:entry title="${%ClientSecretVariable}" field="clientSecretVariable">
<f:textbox default="${descriptor.getDefaultClientSecretVariable()}"/>
</f:entry>
<f:entry title="${%TenantIdVariable}" field="tenantIdVariable" help="/plugin/azure-credentials/help-tenantIdVariable.html">
<f:entry title="${%TenantIdVariable}" field="tenantIdVariable">
<f:textbox default="${descriptor.getDefaultTenantIdVariable()}"/>
</f:entry>
</j:jelly>
0 src/main/webapp/help-clientIdVariable.html → ...entialsBinding/help-clientIdVariable.html
View file
Open in desktop
File renamed without changes.
0 ...ain/webapp/help-clientSecretVariable.html → ...alsBinding/help-clientSecretVariable.html
View file
Open in desktop
File renamed without changes.
0 ...n/webapp/help-subscriptionIdVariable.html → ...sBinding/help-subscriptionIdVariable.html
View file
Open in desktop
File renamed without changes.
0 src/main/webapp/help-tenantIdVariable.html → ...entialsBinding/help-tenantIdVariable.html
View file
Open in desktop
File renamed without changes.
8 changes: 3 additions & 5 deletions src/main/resources/com/microsoft/azure/util/AzureImdsCredentials/credentials.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler">
<j:set var="uniqueId" value="${h.generateId()}"/>
<f:entry title="${%Subscription ID}" field="subscriptionId"
help="/plugin/azure-credentials/help-subscriptionId.html">
<f:entry title="${%Subscription ID}" field="subscriptionId" help="/plugin/azure-credentials/help-subscriptionId.html">
<f:textbox/>
</f:entry>

<f:entry title="${%Client ID}" field="clientId">
<f:entry title="${%Client ID}" field="clientIdImds">
<f:textbox/>
</f:entry>

<f:entry title="${%AzureEnvironmentName}" field="azureEnvName"
help="/plugin/azure-credentials/help-azureEnvironmentName.html">
<f:entry title="${%AzureEnvironmentName}" field="azureEnvName" help="/plugin/azure-credentials/help-azureEnvironmentName.html">
<f:select/>
</f:entry>

Expand Down
0 ...l/AzureImdsCredentials/help-clientId.html → ...ureImdsCredentials/help-clientIdImds.html
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...n/resources/com/microsoft/jenkins/keyvault/SecretCertificateCredentials/credentials.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:c="/lib/credentials">
<f:entry title="${%ServicePrincipal}" field="servicePrincipalId">
<f:entry title="${%ServicePrincipal}" field="servicePrincipalId" help="/plugin/azure-credentials/help-servicePrincipalId.html">
<c:select expressionAllowed="false" checkMethod="post"/>
</f:entry>

<f:entry title="${%SecretIdentifier}" field="secretIdentifier">
<f:entry title="${%SecretIdentifier}" field="secretIdentifier" help="/plugin/azure-credentials/help-secretIdentifier.html">
<f:textbox />
</f:entry>

Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/com/microsoft/jenkins/keyvault/SecretStringCredentials/credentials.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:st="jelly:stapler" xmlns:c="/lib/credentials">
<f:entry title="${%ServicePrincipal}" field="servicePrincipalId">
<f:entry title="${%ServicePrincipal}" field="servicePrincipalId"
help="/plugin/azure-credentials/help-servicePrincipalId.html">
<c:select expressionAllowed="false" checkMethod="post" />
</f:entry>

<f:entry title="${%SecretIdentifier}" field="secretIdentifier">
<f:entry title="${%SecretIdentifier}" field="secretIdentifier" help="/plugin/azure-credentials/help-secretIdentifier.html">
<f:textbox />
</f:entry>

Expand Down
10 changes: 0 additions & 10 deletions ...sources/com/microsoft/jenkins/keyvault/SecretStringCredentials/help-secretIdentifier.html
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...urces/com/microsoft/jenkins/keyvault/SecretStringCredentials/help-servicePrincipalId.html
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/main/webapp/help-msiPort.html
View file
Open in desktop

This file was deleted.

0 ...ateCredentials/help-secretIdentifier.html → src/main/webapp/help-secretIdentifier.html
View file
Open in desktop
File renamed without changes.
0 ...eCredentials/help-servicePrincipalId.html → src/main/webapp/help-servicePrincipalId.html
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions src/main/webapp/help-subscriptionId.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,4 @@
Enter an Azure subscription ID.

You can get this information from the Azure portal or from an Azure publish settings file.

If you don't have an Azure publish settings file, you can download one from <a
href="https://manage.windowsazure.com/publishsettings/Index?SchemaVersion=2.0" target="_blank">here</a>
</div>