Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
hkarthik7 committed Jan 4, 2022
2 parents f2952fb + 7944b75 commit 3ef470b
Show file tree
Hide file tree
Showing 37 changed files with 3,592 additions and 13 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# Changelog

## 2.5.9
- Expanded the WorkItemTrackingDetails interface with two updateWorkItem
methods and added hyperlinks support. [Associated PR](https://github.com/hkarthik7/azure-devops-java-sdk/pull/10)
- Added support for **Distributed Task Api**

## 2.5.8
- Merged PR: [Added support for **policy Api** #8](https://github.com/hkarthik7/azure-devops-java-sdk/pull/8)
- Merged PR: [Added support for **build tags** API #9](https://github.com/hkarthik7/azure-devops-java-sdk/pull/9)
- Added support for Pipelines API.
- Expanded the WorkItemTrackingDetails interface with two updateWorkItem
methods and added hyperlinks support. [Associated PR](https://github.com/hkarthik7/azure-devops-java-sdk/pull/10)

## 2.5.7
- Created a helper method in **BuildApi** to easily create/clone a pipeline.
Expand Down
2 changes: 2 additions & 0 deletions azd/src/main/java/org/azd/common/ApiVersion.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public abstract class ApiVersion {
public static final String BUILD_DEFINITION_REVISIONS = "6.1-preview.3";
public static final String BUILD_TAGS = "6.1-preview.3";
public static final String CORE = "6.1-preview.1";
public static final String DISTRIBUTED_TASK = "6.1-preview.1";
public static final String EXTENSION_MANAGEMENT = "6.1-preview.1";
public static final String POLICY = "6.1-preview.1";
public static final String PROJECT = "6.1-preview.4";
Expand All @@ -29,6 +30,7 @@ public abstract class ApiVersion {
public static final String RELEASE_DEFINITION_HISTORY = "6.1-preview.1";
public static final String SERVICE_ENDPOINTS = "6.1-preview.4";
public static final String SERVICE_HOOKS = "6.1-preview.1";
public static final String VARIABLE_GROUPS = "6.1-preview.2";
public static final String WIKI = "6.1-preview.2";
public static final String WORK = "6.1-preview.1";
public static final String WORK_ITEM_TRACKING = "6.1-preview.3";
Expand Down
867 changes: 867 additions & 0 deletions azd/src/main/java/org/azd/distributedtask/DistributedTaskApi.java

Large diffs are not rendered by default.

133 changes: 133 additions & 0 deletions azd/src/main/java/org/azd/distributedtask/types/DeploymentGroup.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
package org.azd.distributedtask.types;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.azd.release.types.ProjectReference;

import java.util.Arrays;
import java.util.List;

/***
* Deployment group.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class DeploymentGroup {
/***
* Description of the deployment group.
*/
@JsonProperty("description")
private String description;
/***
* Deployment group identifier.
*/
@JsonProperty("id")
private int id;
/***
* Number of deployment targets in the deployment group.
*/
@JsonProperty("machineCount")
private int machineCount;
/***
* List of unique tags across all deployment targets in the deployment group.
*/
@JsonProperty("machineTags")
private String[] machineTags;
/***
* List of deployment targets in the deployment group.
*/
@JsonProperty("machines")
private List<DeploymentMachine> machines;
/***
* Name of the deployment group.
*/
@JsonProperty("name")
private String name;
/***
* Deployment pool in which deployment agents are registered.
*/
@JsonProperty("pool")
private TaskAgentPoolReference pool;
/***
* Project to which the deployment group belongs.
*/
@JsonProperty("project")
private ProjectReference project;

public String getDescription() {
return description;
}

public void setDescription(String description) {
this.description = description;
}

public int getId() {
return id;
}

public void setId(int id) {
this.id = id;
}

public int getMachineCount() {
return machineCount;
}

public void setMachineCount(int machineCount) {
this.machineCount = machineCount;
}

public String[] getMachineTags() {
return machineTags;
}

public void setMachineTags(String[] machineTags) {
this.machineTags = machineTags;
}

public List<DeploymentMachine> getMachines() {
return machines;
}

public void setMachines(List<DeploymentMachine> machines) {
this.machines = machines;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public TaskAgentPoolReference getPool() {
return pool;
}

public void setPool(TaskAgentPoolReference pool) {
this.pool = pool;
}

public ProjectReference getProject() {
return project;
}

public void setProject(ProjectReference project) {
this.project = project;
}

@Override
public String toString() {
return "DeploymentGroup{" +
"description='" + description + '\'' +
", id=" + id +
", machineCount=" + machineCount +
", machineTags=" + Arrays.toString(machineTags) +
", machines=" + machines +
", name='" + name + '\'' +
", pool=" + pool +
", project=" + project +
'}';
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package org.azd.distributedtask.types;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;

import java.util.List;

/***
* List of deployment group
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class DeploymentGroups {
/***
* List of deployment group
*/
@JsonProperty("value")
private List<DeploymentGroup> deploymentGroups;

@Override
public String toString() {
return "DeploymentGroups{" +
"deploymentGroups=" + deploymentGroups +
'}';
}

public List<DeploymentGroup> getDeploymentGroups() {
return deploymentGroups;
}

public void setDeploymentGroups(List<DeploymentGroup> deploymentGroups) {
this.deploymentGroups = deploymentGroups;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package org.azd.distributedtask.types;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;

import java.util.Arrays;

/***
* Deployment target.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class DeploymentMachine {
/***
*
* Deployment agent.
*/
@JsonProperty("agent")
private TaskAgent agent;
/***
* Deployment target Identifier.
*/
@JsonProperty("id")
private int id;
/***
* Properties of the deployment target.
*/
@JsonProperty("properties")
private JsonNode properties;
/***
* Tags of the deployment target.
*/
@JsonProperty("tags")
private String[] tags;

public TaskAgent getAgent() {
return agent;
}

public void setAgent(TaskAgent agent) {
this.agent = agent;
}

public int getId() {
return id;
}

public void setId(int id) {
this.id = id;
}

public JsonNode getProperties() {
return properties;
}

public void setProperties(JsonNode properties) {
this.properties = properties;
}

public String[] getTags() {
return tags;
}

public void setTags(String[] tags) {
this.tags = tags;
}

@Override
public String toString() {
return "DeploymentMachine{" +
"agent=" + agent +
", id=" + id +
", properties=" + properties +
", tags=" + Arrays.toString(tags) +
'}';
}
}
Loading

0 comments on commit 3ef470b

Please sign in to comment.