Skip to content

Handle packages in Microsoft scopeto support renaming of opentelemetry #12458

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

Merged
praveenkuttappan merged 7 commits into from
Nov 17, 2020
Merged

Handle packages in Microsoft scopeto support renaming of opentelemetry #12458

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ebeb20
Handle packages in Microsoft scopeto support renaming of opentelemetry
praveenkuttappan Nov 11, 2020
aedcffc
Additional fixes
praveenkuttappan Nov 11, 2020
7512ef6
Retrieve package name from artifact
praveenkuttappan Nov 12, 2020
e747db4
Revert changes in common and reuse existing function to get package name
praveenkuttappan Nov 12, 2020
dae004c
Revert changes in common script
praveenkuttappan Nov 12, 2020
0faf6d9
Fix as per review comments
praveenkuttappan Nov 16, 2020
c410f3d
Added warning and check to ensure only one artifact is found in path
praveenkuttappan Nov 17, 2020
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
4 changes: 2 additions & 2 deletions eng/scripts/Language-Settings.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ function Get-javascript-PackageInfoFromRepo ($pkgPath, $serviceDirectory, $pkgNa
if (Test-Path $projectPath)
{
$projectJson = Get-Content $projectPath | ConvertFrom-Json
$jsStylePkgName = $pkgName.replace("azure-", "@azure/")
if ($projectJson.name -eq "$jsStylePkgName")
$jsStylePkgName = $projectJson.name.Replace("@", "").Replace("/", "-")
if ($pkgName -eq "$jsStylePkgName")
Comment thread
praveenkuttappan marked this conversation as resolved.
{
return [PackageProps]::new($projectJson.name, $projectJson.version, $pkgPath, $serviceDirectory)
}
Expand Down
8 changes: 7 additions & 1 deletion eng/tools/dependency-testing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,13 @@ async function main(argv) {
const testFolder = argv["test-folder"];
const dryRun = argv["dry-run"];

const packageName = artifactName.replace("azure-", "@azure/");
let packageName = "";
Comment thread
praveenkuttappan marked this conversation as resolved.
Outdated
if (artifactName.startsWith("microsoft-")) {
packageName = artifactName.replace("microsoft-", "@microsoft/");
}
else {
packageName = artifactName.replace("azure-", "@azure/");
}
const targetPackage = await getPackageFromRush(repoRoot, packageName);
const targetPackagePath = path.join(repoRoot, targetPackage.projectFolder);

Expand Down
2 changes: 1 addition & 1 deletion eng/tools/generate-static-index/templates/matthews/styles/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function getPackageUrl(language, package, version) {
$(function () {
$('h4').each(function () {
var pkgName = $(this).text()
.replace("@azure/", "azure-");
.replace("@", "").replace("/", "-");
populateIndexList($(this), pkgName)
});
})
3 changes: 1 addition & 2 deletions eng/tools/versioning/increment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@ async function main(argv) {
const repoRoot = argv["repo-root"];
const dryRun = argv["dry-run"];

const packageName = artifactName.replace("azure-", "@azure/");
const rushSpec = await packageUtils.getRushSpec(repoRoot);
const targetPackage = rushSpec.projects.find(
packageSpec => packageSpec.packageName == packageName
packageSpec => packageSpec.packageName.replace("@", "").replace("/", "-") == artifactName
);

const targetPackagePath = path.join(repoRoot, targetPackage.projectFolder);
Expand Down
3 changes: 1 addition & 2 deletions eng/tools/versioning/set-version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ async function main(argv) {
const repoRoot = argv["repo-root"];
const dryRun = argv["dry-run"];

const packageName = artifactName.replace("azure-", "@azure/");
const rushSpec = await packageUtils.getRushSpec(repoRoot);

const targetPackage = rushSpec.projects.find(
packageSpec => packageSpec.packageName == packageName
packageSpec => packageSpec.packageName.replace("@", "").replace("/", "-") == packageName
);

const targetPackagePath = path.join(repoRoot, targetPackage.projectFolder);
Expand Down