diff --git a/.github/workflows/nightly-merge.yml b/.github/workflows/nightly-merge.yml deleted file mode 100644 index ede08f6df31..00000000000 --- a/.github/workflows/nightly-merge.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: 'Nightly Merge (master to iiot)' - -on: - schedule: - - cron: '0 0 * * *' - -jobs: - nightly-merge: - - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v1 - - - name: Nightly Merge - uses: robotology/gh-action-nightly-merge@v1.2.0 - with: - stable_branch: 'master' - development_branch: 'iiot' - allow_ff: false - push_token: 'IIOT_NIGHTLY_MERGE_PUSH_TOKEN' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - IIOT_NIGHTLY_MERGE_PUSH_TOKEN: ${{ secrets.IIOT_NIGHTLY_MERGE_PUSH_TOKEN }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2c12d84fda5..515a6067902 100644 --- a/.gitignore +++ b/.gitignore @@ -88,7 +88,7 @@ From: AzSec@microsoft.com [Ss][Yy][Ss][Pp][Rr][Ee][Pp].[Ii][Nn][Ff] ### -From: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +From: https://github.com/github/gitignore/blob/main/VisualStudio.gitignore Commit: 5130d9a5060fcaed8f7458a8717b5573f5562774 ### diff --git a/README.md b/README.md index 963cec14226..ed923950c0b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # IoT Edge -[![Build Status](https://msazure.visualstudio.com/One/_apis/build/status/Custom/Azure/IoT/Edge/Core/Azure-IoT-Edge-Core%20CI?branchName=master)](https://msazure.visualstudio.com/One/_build/latest?definitionId=45137&branchName=master) +[![Build Status](https://dev.azure.com/msazure/One/_apis/build/status/Custom/Azure/IoT/Edge/Core/Azure-IoT-Edge-Core%20CI?branchName=main)](https://dev.azure.com/msazure/One/_build/latest?definitionId=45137&branchName=main) Welcome to the home of IoT Edge. diff --git a/builds/checkin/dotnet.yaml b/builds/checkin/dotnet.yaml index bbe1e125acb..59f1a6688dd 100644 --- a/builds/checkin/dotnet.yaml +++ b/builds/checkin/dotnet.yaml @@ -2,7 +2,7 @@ trigger: none pr: branches: include: - - master + - main - release/* - iiot jobs: diff --git a/builds/checkin/e2e-checkin.yaml b/builds/checkin/e2e-checkin.yaml index d59958611e2..c22df8b8227 100644 --- a/builds/checkin/e2e-checkin.yaml +++ b/builds/checkin/e2e-checkin.yaml @@ -7,7 +7,7 @@ trigger: none pr: branches: include: - - master + - main - release/* resources: diff --git a/builds/checkin/edgelet.yaml b/builds/checkin/edgelet.yaml index 9ebe0768327..6f4e8ccb0b7 100644 --- a/builds/checkin/edgelet.yaml +++ b/builds/checkin/edgelet.yaml @@ -2,7 +2,7 @@ trigger: none pr: branches: include: - - master + - main - release/* - iiot jobs: diff --git a/builds/checkin/libiothsm.yaml b/builds/checkin/libiothsm.yaml index 873679d17c3..60c1dcc99de 100644 --- a/builds/checkin/libiothsm.yaml +++ b/builds/checkin/libiothsm.yaml @@ -2,7 +2,7 @@ trigger: none pr: branches: include: - - master + - main - release/* - iiot jobs: diff --git a/builds/ci/dotnet.yaml b/builds/ci/dotnet.yaml index 6a2eb6f54b1..f3eb2657f6f 100644 --- a/builds/ci/dotnet.yaml +++ b/builds/ci/dotnet.yaml @@ -2,7 +2,7 @@ trigger: batch: true branches: include: - - master + - main - release/* - iiot pr: none diff --git a/builds/ci/edgelet.yaml b/builds/ci/edgelet.yaml index f254b5d9494..0e9756fdfb2 100644 --- a/builds/ci/edgelet.yaml +++ b/builds/ci/edgelet.yaml @@ -2,7 +2,7 @@ trigger: batch: true branches: include: - - master + - main - release/* - iiot pr: none diff --git a/builds/ci/libiothsm.yaml b/builds/ci/libiothsm.yaml index 4cf6e478096..7a6e702d299 100644 --- a/builds/ci/libiothsm.yaml +++ b/builds/ci/libiothsm.yaml @@ -2,7 +2,7 @@ trigger: batch: true branches: include: - - master + - main - release/* - iiot pr: none diff --git a/builds/e2e/proxy-deployment-template.json b/builds/e2e/proxy-deployment-template.json index 25b436522f2..f735a76ba54 100644 --- a/builds/e2e/proxy-deployment-template.json +++ b/builds/e2e/proxy-deployment-template.json @@ -79,13 +79,13 @@ } }, "variables": { - "agent_prep1_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/agent.sh", - "agent_prep2_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/agent_final.sh", - "create_linux_vm_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/create-linux-vm-template.json", - "create_windows_vm_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/create-windows-vm-template.json", - "finalize_agent_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/finalize-agent-template.json", - "runner1_prep_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/runner.sh", - "runner2_prep_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/master/builds/e2e/Runner.ps1" + "agent_prep1_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/agent.sh", + "agent_prep2_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/agent_final.sh", + "create_linux_vm_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/create-linux-vm-template.json", + "create_windows_vm_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/create-windows-vm-template.json", + "finalize_agent_template_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/finalize-agent-template.json", + "runner1_prep_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/runner.sh", + "runner2_prep_script_uri": "https://raw.githubusercontent.com/Azure/iotedge/main/builds/e2e/Runner.ps1" }, "resources": [{ "type": "Microsoft.KeyVault/vaults", diff --git a/builds/misc/images.yaml b/builds/misc/images.yaml index 81137c0c54f..c174bb86c9c 100644 --- a/builds/misc/images.yaml +++ b/builds/misc/images.yaml @@ -2,7 +2,7 @@ trigger: batch: true branches: include: - - master + - main - release/* pr: none diff --git a/builds/misc/packages.slow.yaml b/builds/misc/packages.slow.yaml index c79a0180148..4738f94ddea 100644 --- a/builds/misc/packages.slow.yaml +++ b/builds/misc/packages.slow.yaml @@ -5,7 +5,7 @@ trigger: batch: true branches: include: - - master + - main - release/* pr: none variables: diff --git a/builds/misc/packages.yaml b/builds/misc/packages.yaml index 5dc32f01791..17680501c7e 100644 --- a/builds/misc/packages.yaml +++ b/builds/misc/packages.yaml @@ -2,7 +2,7 @@ trigger: batch: true branches: include: - - master + - main - release/* pr: none diff --git a/builds/misc/templates/build-rocksdb.yaml b/builds/misc/templates/build-rocksdb.yaml index a0354241417..c60cbfb5e53 100644 --- a/builds/misc/templates/build-rocksdb.yaml +++ b/builds/misc/templates/build-rocksdb.yaml @@ -26,7 +26,7 @@ stages: postfix: arm64 steps: - bash: | - build_image=rocksdb-build:master-$(postfix)-$(Build.BuildNumber) && \ + build_image=rocksdb-build:main-$(postfix)-$(Build.BuildNumber) && \ mkdir -p $(Build.ArtifactStagingDirectory)/librocksdb && \ cd $(System.DefaultWorkingDirectory)/edge-util/docker/linux/$(arch) && \ docker build --tag ${build_image} . && \ diff --git a/builds/service/service-deployment.yaml b/builds/service/service-deployment.yaml index 879b481fe3f..f67105d05f7 100644 --- a/builds/service/service-deployment.yaml +++ b/builds/service/service-deployment.yaml @@ -7,7 +7,7 @@ schedules: displayName: Nightly build branches: include: - - master + - main always: true pool: diff --git a/doc/StyleGuide.md b/doc/StyleGuide.md index d7e654ad9d4..55d1e29c5ae 100644 --- a/doc/StyleGuide.md +++ b/doc/StyleGuide.md @@ -8,7 +8,7 @@ C# is a very broad, multi-paradigm language. It's done a good job over the years ### Baseline -Our baseline C# Coding Style is defined [here](https://github.com/Azure/DotNetty/wiki/C#-Coding-Style). These guidelines are used by the broader IoT Hub team. In order to enforce coding style, StyleCop (NuGet version) is used. StyleCop will be run automatically during build except Debug configuration. Some StyleCop rules are not applicable to IoT Edge, you can find out from [here](https://github.com/Azure/iotedge/blob/master/stylecop.ruleset). +Our baseline C# Coding Style is defined [here](https://github.com/Azure/DotNetty/wiki/C#-Coding-Style). These guidelines are used by the broader IoT Hub team. In order to enforce coding style, StyleCop (NuGet version) is used. StyleCop will be run automatically during build except Debug configuration. Some StyleCop rules are not applicable to IoT Edge, you can find out from [here](https://github.com/Azure/iotedge/blob/main/stylecop.ruleset). ### Resharper diff --git a/doc/build-test.md b/doc/build-test.md index b884927308b..49021950732 100644 --- a/doc/build-test.md +++ b/doc/build-test.md @@ -4,23 +4,19 @@ IoT Edge Build and Test Infrastructure Build ----- -We use Azure DevOps to build and release. - -More information about Azure DevOps is available [here](https://docs.microsoft.com/en-us/azure/devops/pipelines/overview). +We use [Azure DevOps](https://docs.microsoft.com/en-us/azure/devops/pipelines/overview) to build and release. Our builds fall into these categories: -| Type | Goal | Trigger | Target | -|-------------------------------------------|---------------------------------------------------------------------------------------------------------------|------------------------------------------------|-----------------------------| -| Checkin | Ensures that the master branch builds clean and passes basic tests. | When commits are pushed to a Pull Request (PR) | Linux - x64 | -| Security Development Lifecycle (SDL) | Scans and analyzes the code to detect security issues. | When commits are pushed to a PR | Windows - x64 | -| Continuous Integration (CI) | Runs end-to-end tests, builds Docker images & publishes to ACR, builds iotedgectl pypi archive. | After a PR is merged to master | Linux - x64, Windows - x64 | -| Continuous Deployment (CD) | Consumes artifacts from CI, deploys IoT Edge to a Linux VM and a Raspberry Pi and tests basic functionality. | After a successful CI build | Linux - x64 | -| Images | Builds Docker images & publishes to ACR. | Manual | Linux - x64, Windows - x64 | -| Service Deployment Verification | Runs smoke tests. Used to validate IoT Edge scenarios before the service deploys updates. | Manual | Linux - x64 | -| Release Build | Under the Release/ folder. Builds IoT Edge core runtime (C#) and iotedgectl tool (Python). | Manual | Linux - x64, Windows - x64 | -| Release Publish | Under the Release/ folder. Builds Docker images from signed IoT Edge runtime binaries. | Manual | Linux - x64, Windows - x64 | - +| Type | Goal | Trigger | Target | +|-------------------------------------------|---------------------------------------------------------------------------------------------------------------|------------------------------------------------|---------------------------------------------------| +| Checkin | Ensures that a branch builds clean and passes basic tests. | When commits are pushed to a Pull Request (PR) | Linux (amd64), Windows (amd64) | +| Security Development Lifecycle (SDL) | Scans and analyzes the code to detect security issues. | When commits are pushed to a PR | Windows (amd64) | +| Continuous Integration (CI) | Ensures that a branch builds clean and passes integration tests, builds host packages and Docker images. | After a PR is merged | Linux (amd64, aarch64, arm32v7), Windows (amd64) | +| Continuous Deployment (CD) | Consumes artifacts from CI, deploys IoT Edge to supported devices and tests basic functionality. | After a successful CI build | Linux (amd64, aarch64, arm32v7), Windows (amd64) | +| Service Deployment Verification | Runs smoke tests. Used to validate IoT Edge scenarios before IoT Hub deploys updates. | Manual | Linux (amd64) | +| Build Release | Builds IoT Edge packages and Docker images for final release | Manual | Linux (amd64, aarch64, arm32v7), Windows (amd64) | +| Publish Release | Publishes IoT Edge packages and Docker images to public release locations. | Manual | Linux (amd64, aarch64, arm32v7), Windows (amd64) | Test ---- diff --git a/doc/built-in-logs-pull.md b/doc/built-in-logs-pull.md index e4db9d06b94..fc3e975a0d7 100644 --- a/doc/built-in-logs-pull.md +++ b/doc/built-in-logs-pull.md @@ -21,7 +21,7 @@ For best compatibility with this feature, the recommended logging format is: `{LogLevel}` should follow the [Syslog severity level format](https://wikipedia.org/wiki/Syslog#Severity_lnevel) and `{Timestamp}` should be formatted as `yyyy-mm-dd hh:mm:ss.fff zzz`. -The [Logger class in IoT Edge](https://github.com/Azure/iotedge/blob/master/edge-util/src/Microsoft.Azure.Devices.Edge.Util/Logger.cs) serves as a canonical implementation. +The [Logger class in IoT Edge](https://github.com/Azure/iotedge/blob/main/edge-util/src/Microsoft.Azure.Devices.Edge.Util/Logger.cs) serves as a canonical implementation. ## UploadModuleLogs diff --git a/doc/rc/how-to-auto-provision-x509-certificates.md b/doc/rc/how-to-auto-provision-x509-certificates.md index ca7ab960800..fcf8f502029 100644 --- a/doc/rc/how-to-auto-provision-x509-certificates.md +++ b/doc/rc/how-to-auto-provision-x509-certificates.md @@ -126,7 +126,7 @@ The Azure IoT Edge git repository contains scripts that you can use to generate 1. Open a PowerShell window in administrator mode. -1. Clone the git repo that contains scripts to generate non-production certificates. These scripts help you create the necessary certificates to use X.509 attestation when creating a DPS enrollment. Use the `git clone` command or [download the ZIP](https://github.com/Azure/iotedge/archive/master.zip). +1. Clone the git repo that contains scripts to generate non-production certificates. These scripts help you create the necessary certificates to use X.509 attestation when creating a DPS enrollment. Use the `git clone` command or [download the ZIP](https://github.com/Azure/iotedge/archive/main.zip). ```powershell git clone https://github.com/Azure/iotedge.git @@ -141,7 +141,7 @@ The Azure IoT Edge git repository contains scripts that you can use to generate copy \iotedge\tools\CACertificates\ca-certs.ps1 . ``` - If you downloaded the repo as a ZIP, then the folder name is `iotedge-master` and the rest of the path is the same. + If you downloaded the repo as a ZIP, then the folder name is `iotedge-main` and the rest of the path is the same. 1. Enable PowerShell to run the scripts. diff --git a/edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Docker/DockerUtil.cs b/edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Docker/DockerUtil.cs index 35746ceed36..943d76f7e38 100644 --- a/edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Docker/DockerUtil.cs +++ b/edge-agent/src/Microsoft.Azure.Devices.Edge.Agent.Docker/DockerUtil.cs @@ -34,7 +34,7 @@ public static class DockerUtil /// /// tl;dr if there is more than one path-component, and the first component contains a '.' or ':' then /// it is a registry address. - /// For more information: https://github.com/docker/distribution/blob/master/reference/reference.go + /// For more information: https://github.com/docker/distribution/blob/main/reference/reference.go /// /// docker image tag /// docker domain diff --git a/edge-modules/azure-monitor/src/PrometheusMetricsParser.cs b/edge-modules/azure-monitor/src/PrometheusMetricsParser.cs index 0cccf4a23e5..3ff315bd941 100644 --- a/edge-modules/azure-monitor/src/PrometheusMetricsParser.cs +++ b/edge-modules/azure-monitor/src/PrometheusMetricsParser.cs @@ -17,7 +17,7 @@ public static class PrometheusMetricsParser // // - https://prometheus.io/docs/concepts/data_model/ // - https://prometheus.io/docs/instrumenting/exposition_formats/ - // - https://github.com/prometheus/common/blob/master/expfmt/text_parse.go + // - https://github.com/prometheus/common/blob/main/expfmt/text_parse.go // // Example: // diff --git a/edge-util/src/Microsoft.Azure.Devices.Edge.Storage.RocksDb/RocksDbOptionsProvider.cs b/edge-util/src/Microsoft.Azure.Devices.Edge.Storage.RocksDb/RocksDbOptionsProvider.cs index 57808a00b8f..138c5f03ff3 100644 --- a/edge-util/src/Microsoft.Azure.Devices.Edge.Storage.RocksDb/RocksDbOptionsProvider.cs +++ b/edge-util/src/Microsoft.Azure.Devices.Edge.Storage.RocksDb/RocksDbOptionsProvider.cs @@ -8,9 +8,9 @@ namespace Microsoft.Azure.Devices.Edge.Storage.RocksDb public class RocksDbOptionsProvider : IRocksDbOptionsProvider { // Some explanations from - // https://github.com/facebook/rocksdb/blob/master/include/rocksdb/options.h + // https://github.com/facebook/rocksdb/blob/main/include/rocksdb/options.h // and - // https://github.com/facebook/rocksdb/blob/master/include/rocksdb/advanced_options.h + // https://github.com/facebook/rocksdb/blob/main/include/rocksdb/advanced_options.h // These defaults were taken from ColumnFamilyOptions::OptimizeForSmallDb() // write_buffer_size = 2M (bytes) per column family diff --git a/edge-util/src/Microsoft.Azure.Devices.Edge.Storage/StorageLogLevel.cs b/edge-util/src/Microsoft.Azure.Devices.Edge.Storage/StorageLogLevel.cs index 63dc2887b88..84e96d52fc9 100644 --- a/edge-util/src/Microsoft.Azure.Devices.Edge.Storage/StorageLogLevel.cs +++ b/edge-util/src/Microsoft.Azure.Devices.Edge.Storage/StorageLogLevel.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. namespace Microsoft.Azure.Devices.Edge.Storage { - // Ref: https://github.com/facebook/rocksdb/blob/master/java/src/main/java/org/rocksdb/InfoLogLevel.java + // Ref: https://github.com/facebook/rocksdb/blob/main/java/src/main/java/org/rocksdb/InfoLogLevel.java public enum StorageLogLevel { DEBUG = 0, diff --git a/edgelet/build/linux/package-mariner.sh b/edgelet/build/linux/package-mariner.sh index 5722a9c4e45..c70e352ecfc 100755 --- a/edgelet/build/linux/package-mariner.sh +++ b/edgelet/build/linux/package-mariner.sh @@ -39,17 +39,17 @@ replace-with = "vendored-sources" [source."https://github.com/Azure/hyperlocal-windows"] git = "https://github.com/Azure/hyperlocal-windows" -branch = "master" +branch = "main" replace-with = "vendored-sources" [source."https://github.com/Azure/mio-uds-windows.git"] git = "https://github.com/Azure/mio-uds-windows.git" -branch = "master" +branch = "main" replace-with = "vendored-sources" [source."https://github.com/Azure/tokio-uds-windows.git"] git = "https://github.com/Azure/tokio-uds-windows.git" -branch = "master" +branch = "main" replace-with = "vendored-sources" [source.vendored-sources] diff --git a/edgelet/contrib/README.md b/edgelet/contrib/README.md index 550b69eeea2..4d3eeb3103e 100644 --- a/edgelet/contrib/README.md +++ b/edgelet/contrib/README.md @@ -27,25 +27,25 @@ make deb ``` ### Installed Files -All of the accompanying files in the debian package can be found in the `contrib` directory in the repo: https://github.com/Azure/iotedge/tree/master/edgelet/contrib +All of the accompanying files in the debian package can be found in the `contrib` directory in the repo: https://github.com/Azure/iotedge/tree/main/edgelet/contrib #### Config files -[config.yaml](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/config/linux/debian/config.yaml) installed as `/etc/iotedge/config.yaml` with mode/user `400 iotedge:iotedge` +[config.yaml](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/config/linux/debian/config.yaml) installed as `/etc/iotedge/config.yaml` with mode/user `400 iotedge:iotedge` -[logrotate](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/config/linux/logrotate) installed as `/etc/logrotate.d/iotedge` with mode/user `644 root:root` +[logrotate](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/config/linux/logrotate) installed as `/etc/logrotate.d/iotedge` with mode/user `644 root:root` #### Man Pages -[iotedge.1](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/man/man1/iotedge.1) installed as `/usr/share/man/man1/iotedge.1.gz` with mode/user `644 root:root` +[iotedge.1](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/man/man1/iotedge.1) installed as `/usr/share/man/man1/iotedge.1.gz` with mode/user `644 root:root` -[iotedged.8](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/man/man8/iotedged.8) installed as `/usr/share/man/man8/iotedge.8.gz` with mode/user `644 root:root` +[iotedged.8](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/man/man8/iotedged.8) installed as `/usr/share/man/man8/iotedge.8.gz` with mode/user `644 root:root` #### Docs -[LICENSE](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/docs/LICENSE) installed as `/usr/share/doc/iotedge/LICENSE` with mode/user `644 root:root` +[LICENSE](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/docs/LICENSE) installed as `/usr/share/doc/iotedge/LICENSE` with mode/user `644 root:root` -[ThirdPartyNotices](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/docs/ThirdPartyNotices) installed as `/usr/share/doc/iotedge/ThirdPartyNotices` with mode/user `644 root:root` +[ThirdPartyNotices](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/docs/ThirdPartyNotices) installed as `/usr/share/doc/iotedge/ThirdPartyNotices` with mode/user `644 root:root` -[trademark](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/docs/trademark) installed as `/usr/share/doc/iotedge/trademark` with mode/user `644 root:root` +[trademark](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/docs/trademark) installed as `/usr/share/doc/iotedge/trademark` with mode/user `644 root:root` #### Binaries `iotedge` installed as `/usr/bin/iotedge` with mode/user `755 root:root` @@ -54,37 +54,37 @@ All of the accompanying files in the debian package can be found in the `contrib #### Systemd -[iotedge.service](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/systemd/debian/iotedge.service) installed as `/lib/systemd/system/iotedge.service` with mode/user `644 root:root` +[iotedge.service](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/systemd/debian/iotedge.service) installed as `/lib/systemd/system/iotedge.service` with mode/user `644 root:root` -[iotedge.socket](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/systemd/debian/iotedge.socket) installed as `/lib/systemd/system/iotedge.socket` with mode/user `644 root:root` +[iotedge.socket](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/systemd/debian/iotedge.socket) installed as `/lib/systemd/system/iotedge.socket` with mode/user `644 root:root` -[iotedge.mgmt.service](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/systemd/debian/iotedge.mgmt.socket) installed as `/lib/systemd/system/iotedge.mgmt.socket` with mode/user `644 root:root` +[iotedge.mgmt.service](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/systemd/debian/iotedge.mgmt.socket) installed as `/lib/systemd/system/iotedge.mgmt.socket` with mode/user `644 root:root` #### SysV Init -[iotedge.init](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/debian/iotedge.init) installed as `/etc/init.d/iotedge` with mode/user `755 root:root` +[iotedge.init](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/debian/iotedge.init) installed as `/etc/init.d/iotedge` with mode/user `755 root:root` -[iotedge.default](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/debian/iotedge.default) installed as `/etc/default/iotedge` with mode/user `644 root:root` +[iotedge.default](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/debian/iotedge.default) installed as `/etc/default/iotedge` with mode/user `644 root:root` ### Directories The `/var/lib/iotedge` and `/var/log/iotedge` directories are both created with mode/user `755 iotedge:iotedge`. ### Pre-install script -The pre-install script is [here](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/debian/preinst). +The pre-install script is [here](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/debian/preinst). It creates the `iotedge` user and group, adds the `iotedge` user to the `docker` group (so that iotedged can be run unprivileged), and adds all sudoers to the `iotedge` group (so that the `iotedge` tool can be used without sudo). It also verifies that a container runtime is installed before installing. ### Post-install script -The post-install script is [here](https://github.com/Azure/iotedge/blob/master/edgelet/contrib/debian/postinst). +The post-install script is [here](https://github.com/Azure/iotedge/blob/main/edgelet/contrib/debian/postinst). It updates the installed config file's hostname to the device's hostname. ## libiothsm-std -Contains the hsm shared library. The source code is in [https://github.com/Azure/iotedge/tree/master/edgelet/hsm-sys/azure-iot-hsm-c](https://github.com/Azure/iotedge/tree/master/edgelet/hsm-sys/azure-iot-hsm-c). +Contains the hsm shared library. The source code is in [https://github.com/Azure/iotedge/tree/main/edgelet/hsm-sys/azure-iot-hsm-c](https://github.com/Azure/iotedge/tree/main/edgelet/hsm-sys/azure-iot-hsm-c). Build the package with: diff --git a/edgelet/doc/devguide.md b/edgelet/doc/devguide.md index 4abad93c805..7fb65f04699 100644 --- a/edgelet/doc/devguide.md +++ b/edgelet/doc/devguide.md @@ -65,7 +65,7 @@ cd iotedge/edgelet/ rustup update # Install / update the toolchain used to build the daemon binaries. # This is controlled by the rust-toolchain file in this directory. - # For the master branch, this is the latest "stable" toolchain. + # For the main branch, this is the latest "stable" toolchain. # For release branches, this is a pinned Rust release. ``` diff --git a/edgelet/doc/testiotedgedapi.md b/edgelet/doc/testiotedgedapi.md index b2b9062d428..fbc563dfb6a 100644 --- a/edgelet/doc/testiotedgedapi.md +++ b/edgelet/doc/testiotedgedapi.md @@ -3,12 +3,12 @@ If you are a developer working on API endpoint changes, you will definitely want to test locally before committing any changes. Follow below steps for IoT Edge daemon API endpoints testing. ### Pre-requisites -1. A dev machine is set up according to [devguide](https://github.com/Azure/iotedge/blob/master/edgelet/doc/devguide.md) in Linux. +1. A dev machine is set up according to [devguide](https://github.com/Azure/iotedge/blob/main/edgelet/doc/devguide.md) in Linux. 2. Install Git on dev machine; refer details from [here](https://git-scm.com/download/linux). 3. Make sure to get the latest version of [IoT Edge source code](https://github.com/Azure/iotedge). ### Steps -Below are steps used to test API endpoints of iotedged running on Linux; and I will use [list_modules](https://github.com/Azure/iotedge/blob/master/edgelet/management/docs/ModuleApi.md#list_modules) as an example. +Below are steps used to test API endpoints of iotedged running on Linux; and I will use [list_modules](https://github.com/Azure/iotedge/blob/main/edgelet/management/docs/ModuleApi.md#list_modules) as an example. 1. Create your IoT Edge device in Azure Portal. 2. Prepare config.yaml file. @@ -81,7 +81,7 @@ Unhandled Exception: System.AggregateException: One or more errors occurred. (Pe 2018-10-11T16:29:04Z [INFO] - [work] - - - [2018-10-11 16:29:04.627120292 UTC] "POST /modules/%24edgeAgent/genid/636748070676263768/encrypt?api-version=2018-06-28 HTTP/1.1" 200 OK 1261 "-" "-" pid(any) ``` -7. You can use `curl` to send request to API endpoint for testing. For example, test [list_modules](https://github.com/Azure/iotedge/blob/master/edgelet/management/docs/ModuleApi.md#list_modules) endpoint: +7. You can use `curl` to send request to API endpoint for testing. For example, test [list_modules](https://github.com/Azure/iotedge/blob/main/edgelet/management/docs/ModuleApi.md#list_modules) endpoint: `curl -v http://172.17.0.1:8080/modules/?api-version=2018-06-28` @@ -105,13 +105,13 @@ tus":"running","description":"running"}}},{"id":"id","name":"edgeAgent","type":" ``` 8. You should follow the structure of requests mentioned in Swagger-generated API documentation. - - [Management Identity API](https://github.com/Azure/iotedge/blob/master/edgelet/management/docs/IdentityApi.md) - - [Management Module API](https://github.com/Azure/iotedge/blob/master/edgelet/management/docs/ModuleApi.md) - - [Workload API](https://github.com/Azure/iotedge/blob/master/edgelet/workload/docs/WorkloadApi.md) + - [Management Identity API](https://github.com/Azure/iotedge/blob/main/edgelet/management/docs/IdentityApi.md) + - [Management Module API](https://github.com/Azure/iotedge/blob/main/edgelet/management/docs/ModuleApi.md) + - [Workload API](https://github.com/Azure/iotedge/blob/main/edgelet/workload/docs/WorkloadApi.md) ### How to construct API request -1. Let's take [create_module](https://github.com/Azure/iotedge/blob/master/edgelet/management/docs/ModuleApi.md#create_module) endpoint as an example. +1. Let's take [create_module](https://github.com/Azure/iotedge/blob/main/edgelet/management/docs/ModuleApi.md#create_module) endpoint as an example. 2. On the top of this page, you will find which HTTP request method (Get, Post, Delete, Put) and path should be used for each API endpoint. 3. You can see required parameters and HTTP request headers for create_module endpoint. The required parameters are `api_version:String` and `module:ModuleSpec`. - `api_version` should be defined in request URI. diff --git a/edgelet/edgelet-hsm/tests/x509_get_configured_identity_cert_success.rs b/edgelet/edgelet-hsm/tests/x509_get_configured_identity_cert_success.rs index 7719347bc3c..11517330e48 100644 --- a/edgelet/edgelet-hsm/tests/x509_get_configured_identity_cert_success.rs +++ b/edgelet/edgelet-hsm/tests/x509_get_configured_identity_cert_success.rs @@ -19,7 +19,7 @@ use test_utils::TestHSMEnvSetup; const DEVICE_IDENTITY_CERT_KEY: &str = "IOTEDGE_DEVICE_IDENTITY_CERT"; const DEVICE_IDENTITY_PK_KEY: &str = "IOTEDGE_DEVICE_IDENTITY_PK"; // the leaf device certificate created below was created using the instructions -// https://github.com/Azure/iotedge/tree/master/tools/CACertificates +// https://github.com/Azure/iotedge/tree/main/tools/CACertificates // Essentially follow the instruction to create an IoT Leaf Device and simply // copy the contents of the generated certificate here. For this test the key // needn't be copied. diff --git a/edgelet/edgelet-hsm/tests/x509_get_identity_cert_fails_when_id_pk_env_is_missing.rs b/edgelet/edgelet-hsm/tests/x509_get_identity_cert_fails_when_id_pk_env_is_missing.rs index 813a8fa76d5..5265477c2ad 100644 --- a/edgelet/edgelet-hsm/tests/x509_get_identity_cert_fails_when_id_pk_env_is_missing.rs +++ b/edgelet/edgelet-hsm/tests/x509_get_identity_cert_fails_when_id_pk_env_is_missing.rs @@ -17,7 +17,7 @@ use test_utils::TestHSMEnvSetup; const DEVICE_IDENTITY_CERT_KEY: &str = "IOTEDGE_DEVICE_IDENTITY_CERT"; // the leaf device certificate created below was created using the instructions -// https://github.com/Azure/iotedge/tree/master/tools/CACertificates +// https://github.com/Azure/iotedge/tree/main/tools/CACertificates // Essentially follow the instruction to create an IoT Leaf Device and simply // copy the contents of the generated certificate here. For this test the key // needn't be copied. diff --git a/edgelet/hsm-sys/azure-iot-hsm-c/.gitignore b/edgelet/hsm-sys/azure-iot-hsm-c/.gitignore index 16fd04c4cea..962a787bab9 100644 --- a/edgelet/hsm-sys/azure-iot-hsm-c/.gitignore +++ b/edgelet/hsm-sys/azure-iot-hsm-c/.gitignore @@ -15,7 +15,7 @@ html/ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. ## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore # User-specific files *.suo diff --git a/edgelet/iotedged/src/signal.rs b/edgelet/iotedged/src/signal.rs index 42991041f05..5e3af4e02a1 100644 --- a/edgelet/iotedged/src/signal.rs +++ b/edgelet/iotedged/src/signal.rs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Adapted from the conduit proxy signal handling: -// https://github.com/runconduit/conduit/blob/master/proxy/src/signal.rs +// https://github.com/linkerd/linkerd2-proxy/blob/79b6285f8/proxy/src/signal.rs use futures::Future; diff --git a/edgelet/systemd/src/linux.rs b/edgelet/systemd/src/linux.rs index a42ef141cf4..06a5b52dc41 100644 --- a/edgelet/systemd/src/linux.rs +++ b/edgelet/systemd/src/linux.rs @@ -3,7 +3,7 @@ //! Implements the daemon interface for socket activation. //! Provides two methods to get the resulting socket by name. //! Based off of [`systemd_socket`](https://github.com/viraptor/systemd_socket) -//! and [`systemd-daemon`](https://github.com/systemd/systemd/tree/master/src/libsystemd/sd-daemon) +//! and [`systemd-daemon`](https://github.com/systemd/systemd/tree/main/src/libsystemd/sd-daemon) use std::collections::{hash_map, HashMap}; use std::env; diff --git a/kubernetes/charts/edge-kubernetes/values.yaml b/kubernetes/charts/edge-kubernetes/values.yaml index 745f7aae212..27beebf13e2 100644 --- a/kubernetes/charts/edge-kubernetes/values.yaml +++ b/kubernetes/charts/edge-kubernetes/values.yaml @@ -206,7 +206,7 @@ edgeAgent: # storageClassName: "" # Set this to true if you wish to turn on experimental features support. Please see - # https://github.com/Azure/iotedge/blob/master/kubernetes/doc/create-options.md to + # https://github.com/Azure/iotedge/blob/release/1.1/kubernetes/doc/create-options.md to # find more information about experimental create options feature. enableExperimentalFeatures: true diff --git a/scripts/linux/publishReleasePackages.sh b/scripts/linux/publishReleasePackages.sh index f391b0f0811..ff97fabbacc 100644 --- a/scripts/linux/publishReleasePackages.sh +++ b/scripts/linux/publishReleasePackages.sh @@ -234,7 +234,7 @@ publish_to_github() #Create Release Page url="https://api.github.com/repos/Azure/azure-iotedge/releases" - body=$(jq -n --arg version "$VERSION" --arg body "$(cat $WDIR/content.txt)" '{tag_name: $version, name: $version, target_commitish:"master", body: $body}') + body=$(jq -n --arg version "$VERSION" --arg body "$(cat $WDIR/content.txt)" '{tag_name: $version, name: $version, target_commitish:"main", body: $body}') sudo rm -rf $WDIR/content.txt echo "Body for Release is $body" diff --git a/test/connectivity/README.md b/test/connectivity/README.md index cc1f2ea628d..47c6a5fe1f3 100644 --- a/test/connectivity/README.md +++ b/test/connectivity/README.md @@ -22,7 +22,7 @@ These are test scenarios to be covered in Connectivity test ### General flow 1. Currently Connectivity test is supported only to run on Linux AMD64. -2. Connectivity test can be run by calling [Connectivity Test script](https://github.com/Azure/iotedge/blob/master/test/connectivity/scripts/connectivityTest.sh). +2. Connectivity test can be run by calling [Connectivity Test script](https://github.com/Azure/iotedge/blob/release/1.1/test/connectivity/scripts/connectivityTest.sh). 3. Each test runs using AMQP and MQTT TCP protocol. 4. For each run, a new tracking id (Guid) is generated by the test script. 5. Test starts after pre-defined warm-up period (default 2 minutes), which assumes EdgeHub and other modules containers are up and running. diff --git a/test/doc/end-to-end-test-config.md b/test/doc/end-to-end-test-config.md index d5c3c923ceb..4c44303a6a4 100644 --- a/test/doc/end-to-end-test-config.md +++ b/test/doc/end-to-end-test-config.md @@ -28,7 +28,7 @@ _Note: A ✔ in the required column indicates that it is required for all the te | `tempFilterImage` | * | Docker image to pull/use for the temperature filter module. Required when running the test 'TempFilter', ignored otherwise.| | `metricsCollectorImage` | * | Docker image to pull/use for the Metrics Collector module. Required when running the test 'MetricsCollector', ignored otherwise.| | `tempSensorImage` || Docker image to pull/use for the temperature sensor module (see the test 'TempSensor'). If not given, `mcr.microsoft.com/azureiotedge-simulated-temperature-sensor:1.0` is used.| -| `edgeAgentBootstrapImage` || Docker image to pull/use for the initial startup of edgeAgent. It is the EdgeAgent image used in config.yaml. This is a temporary parameter - only here now because the 1.0 version is incompatible with the way this test framework verifies deployments in the master branch. If you want to specify your own, the container registry used is the first registry in the list of registries given by the 'registries' parameter|' +| `edgeAgentBootstrapImage` || Docker image to pull/use for the initial startup of edgeAgent. It is the EdgeAgent image used in config.yaml. This is a temporary parameter - only here now because the 1.0 version is incompatible with the way this test framework verifies deployments in the main branch. If you want to specify your own, the container registry used is the first registry in the list of registries given by the 'registries' parameter|' | `numberLoggerImage` || Docker image to pull/use for the Edge agent direct method tests. Used to generate predictable logs. | | `testTimeoutMinutes` || The maximum amount of time, in minutes, a single test should take. If this time is exceeded, the associated test will fail with a timeout error. If not given, the default value is `5`. | | `verbose` || Boolean value indicating whether to output more verbose logging information to standard output during a test run. If not given, the default is `false`. |